2009-06-01 Rodrigo Kumpera <rkumpera@novell.com>

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

diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
index 2ca086b70fa4b606b2e8819c37e62c47ff742941..8a96afa7cc69a00e5c864b6ce77b76e3661d9878 100644 (file)
--- a/mono/metadata/string-icalls.c
+++ b/mono/metadata/string-icalls.c
@@ -5,13 +5,15 @@
  *   Patrik Torstensson (patrik.torstensson@labs2.com)
  *   Duncan Mak  (duncan@ximian.com)
  *
- * (C) 2001 Ximian, Inc.
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  */
 #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>
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/appdomain.h>
@@ -106,6 +108,7 @@ typedef enum {
 MonoArray * 
 ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gint32 count, gint32 options)
 {
+       static MonoClass *String_array;
        MonoString * tmpstr;
        MonoArray * retarr;
        gunichar2 *src;
@@ -121,6 +124,12 @@ ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gin
        srcsize = mono_string_length (me);
        arrsize = mono_array_length (separator);
 
+       if (!String_array) {
+               MonoClass *klass = mono_array_class_get (mono_get_string_class (), 1);
+               mono_memory_barrier ();
+               String_array = klass;
+       }
+
        splitsize = 1;
        /* Count the number of elements we will return. Note that this operation
         * guarantees that we will return exactly splitsize elements, and we will
@@ -152,7 +161,7 @@ ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gin
 
                /* Nothing but separators */
                if (lastpos == 0) {
-                       retarr = mono_array_new (mono_domain_get (), mono_get_string_class (), 0);
+                       retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 0);
                        return retarr;
                }
        }
@@ -161,7 +170,7 @@ ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gin
        if (splitsize == 1) {
                if (remempty == 0 || count == 1) {
                        /* Copy the whole string */
-                       retarr = mono_array_new (mono_domain_get (), mono_get_string_class (), 1);
+                       retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 1);
                        mono_array_setref (retarr, 0, me);
                } else {
                        /* otherwise we have to filter out leading & trailing delims */
@@ -180,7 +189,7 @@ ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gin
                        tmpstrptr = mono_string_chars (tmpstr);
 
                        memcpy (tmpstrptr, src, srcsize * sizeof (gunichar2));
-                       retarr = mono_array_new (mono_domain_get (), mono_get_string_class (), 1);
+                       retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), 1);
                        mono_array_setref (retarr, 0, tmpstr);
                }
                return retarr;
@@ -189,7 +198,7 @@ ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gin
        lastpos = 0;
        arrpos = 0;
        
-       retarr = mono_array_new (mono_domain_get (), mono_get_string_class (), splitsize);
+       retarr = mono_array_new_specific (mono_class_vtable (mono_domain_get (), String_array), splitsize);
 
        for (i = 0; i != srcsize && arrpos != splitsize; i++) {
                if (string_icall_is_in_array (separator, arrsize, src [i])) {