Merge pull request #5714 from alexischr/update_bockbuild

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

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index 0927141e7925f92d753c6579aa0905c816131f22..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)
@@ -7,11 +8,11 @@
  *
  * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
  * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <signal.h>
 #include <string.h>
 #include "mono/utils/mono-membar.h"
 #include <mono/metadata/string-icalls.h>
@@ -22,9 +23,7 @@
 #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-internal.h>
+#include <mono/metadata/gc-internals.h>
 
 /* This function is redirected to String.CreateString ()
    by mono_marshal_get_native_wrapper () */
@@ -37,27 +36,31 @@ ves_icall_System_String_ctor_RedirectToCreateString (void)
 MonoString *
 ves_icall_System_String_InternalAllocateStr (gint32 length)
 {
-       return mono_string_new_size(mono_domain_get (), length);
+       MonoError error;
+       MonoString *str = mono_string_new_size_checked (mono_domain_get (), length, &error);
+       mono_error_set_pending_exception (&error);
+
+       return str;
 }
 
 MonoString  *
 ves_icall_System_String_InternalIntern (MonoString *str)
 {
+       MonoError error;
        MonoString *res;
-       MONO_ARCH_SAVE_REGS;
 
-       res = mono_string_intern(str);
-       if (!res)
-               mono_raise_exception (mono_domain_get ()->out_of_memory_ex);
+       res = mono_string_intern_checked (str, &error);
+       if (!res) {
+               mono_error_set_pending_exception (&error);
+               return NULL;
+       }
        return res;
 }
 
 MonoString * 
 ves_icall_System_String_InternalIsInterned (MonoString *str)
 {
-       MONO_ARCH_SAVE_REGS;
-
-       return mono_string_is_interned(str);
+       return mono_string_is_interned (str);
 }
 
 int
@@ -65,5 +68,6 @@ ves_icall_System_String_GetLOSLimit (void)
 {
        int limit = mono_gc_get_los_limit ();
 
-       return (limit - 2 - sizeof (MonoString)) / 2;
+       return (limit - 2 - G_STRUCT_OFFSET (MonoString, chars)) / 2;
 }
+