[sgen] Concurrent sweep.

[mono.git] / mono / metadata / string-icalls.c

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index 89e54abe1d1e9d135c27db6decf656ccc379ec69..8fef67ec101817c0b75d74e81734a11b43e60aed 100644 (file)
--- a/mono/metadata/string-icalls.c
+++ b/mono/metadata/string-icalls.c
@@ -210,24 +210,19 @@ string_icall_is_in_array (MonoArray *chars, gint32 arraylength, gunichar2 chr)
 MonoString *
 ves_icall_System_String_InternalAllocateStr (gint32 length)
 {
-       MONO_ARCH_SAVE_REGS;
-
-       if (mono_profiler_events & MONO_PROFILE_STRING_ALLOC) {
-               MonoDomain *domain = mono_domain_get ();
-               MonoString *str = mono_string_new_size (domain, length);
-
-               mono_profiler_string_allocation (domain, str);
-               return str;
-       } else
-               return mono_string_new_size(mono_domain_get (), length);
+       return mono_string_new_size(mono_domain_get (), length);
 }
 
 MonoString  *
 ves_icall_System_String_InternalIntern (MonoString *str)
 {
+       MonoString *res;
        MONO_ARCH_SAVE_REGS;
 
-       return mono_string_intern(str);
+       res = mono_string_intern(str);
+       if (!res)
+               mono_raise_exception (mono_domain_get ()->out_of_memory_ex);
+       return res;
 }
 
 MonoString *