projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix sporadic hang in Mono.Debugger.Soft test suite on Windows.
[mono.git]
/
mono
/
metadata
/
string-icalls.c
diff --git
a/mono/metadata/string-icalls.c
b/mono/metadata/string-icalls.c
index be330aa413a76fb8e08c626c6851795937d005ce..e6cbc3dbfead9b35f8be5412e58b529d09bdeaa5 100644
(file)
--- a/
mono/metadata/string-icalls.c
+++ b/
mono/metadata/string-icalls.c
@@
-1,5
+1,6
@@
-/*
- * string-icalls.c: String internal calls for the corlib
+/**
+ * \file
+ * String internal calls for the corlib
*
* Author:
* Patrik Torstensson (patrik.torstensson@labs2.com)
*
* Author:
* Patrik Torstensson (patrik.torstensson@labs2.com)
@@
-22,8
+23,6
@@
#include <mono/metadata/object.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/debug-helpers.h>
#include <mono/metadata/object.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/debug-helpers.h>
-#include <mono/metadata/profiler.h>
-#include <mono/metadata/profiler-private.h>
#include <mono/metadata/gc-internals.h>
/* This function is redirected to String.CreateString ()
#include <mono/metadata/gc-internals.h>
/* This function is redirected to String.CreateString ()
@@
-39,7
+38,7
@@
ves_icall_System_String_InternalAllocateStr (gint32 length)
{
MonoError error;
MonoString *str = mono_string_new_size_checked (mono_domain_get (), length, &error);
{
MonoError error;
MonoString *str = mono_string_new_size_checked (mono_domain_get (), length, &error);
- mono_error_
raise
_exception (&error);
+ mono_error_
set_pending
_exception (&error);
return str;
}
return str;
}