[runtime] Use handles for System.Runtime.CompilerServices.RuntimeHelpers.InitializeArray

diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
index 92c0f81439bb85332600dccb134d68b1c18f76be..7423b14ea912fe11d179eaf5eaada9cb379a91a1 100644 (file)
--- a/mono/metadata/icall-def.h
+++ b/mono/metadata/icall-def.h
@@ -652,7 +652,7 @@ ICALL_TYPE(RUNH, "System.Runtime.CompilerServices.RuntimeHelpers", RUNH_1)
 ICALL(RUNH_1, "GetObjectValue", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_GetObjectValue)
         /* REMOVEME: no longer needed, just so we dont break things when not needed */
 ICALL(RUNH_2, "GetOffsetToStringData", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_GetOffsetToStringData)
-ICALL(RUNH_3, "InitializeArray", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray)
+HANDLES(ICALL(RUNH_3, "InitializeArray", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray))
 ICALL(RUNH_4, "RunClassConstructor", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunClassConstructor)
 ICALL(RUNH_5, "RunModuleConstructor", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_RunModuleConstructor)
 ICALL(RUNH_5h, "SufficientExecutionStack", ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_SufficientExecutionStack)

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 2a207815c4ced42e8313304b096dfcbf1c93a8c1..2689b7d39b1b1e31d960d01cd068fc3e2aae5aa1 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -841,41 +841,37 @@ ves_icall_System_Array_SetGenericValueImpl (MonoArray *arr, guint32 pos, gpointe
 }
 
 ICALL_EXPORT void
-ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoArray *array, MonoClassField *field_handle)
+ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoArrayHandle array, MonoClassField *field_handle, MonoError *error)
 {
-       MonoClass *klass = array->obj.vtable->klass;
+       mono_error_init (error);
+
+       MonoClass *klass = mono_handle_class (array);
        guint32 size = mono_array_element_size (klass);
        MonoType *type = mono_type_get_underlying_type (&klass->element_class->byval_arg);
        int align;
        const char *field_data;
 
        if (MONO_TYPE_IS_REFERENCE (type) || type->type == MONO_TYPE_VALUETYPE) {
-               MonoException *exc = mono_get_exception_argument("array",
-                       "Cannot initialize array of non-primitive type.");
-               mono_set_pending_exception (exc);
+               mono_error_set_argument (error, "array", "Cannot initialize array of non-primitive type");
                return;
        }
 
        if (!(field_handle->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA)) {
-               MonoException *exc = mono_get_exception_argument("field_handle",
-                       "Field doesn't have an RVA");
-               mono_set_pending_exception (exc);
+               mono_error_set_argument (error, "field_handle", "Field '%s' doesn't have an RVA", mono_field_get_name (field_handle));
                return;
        }
 
-       size *= array->max_length;
+       size *= MONO_HANDLE_GETVAL(array, max_length);
        field_data = mono_field_get_data (field_handle);
 
        if (size > mono_type_size (field_handle->type, &align)) {
-               MonoException *exc = mono_get_exception_argument("field_handle",
-                       "Field not large enough to fill array");
-               mono_set_pending_exception (exc);
+               mono_error_set_argument (error, "field_handle", "Field not large enough to fill array");
                return;
        }
 
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 #define SWAP(n) {                                                              \
-       guint ## n *data = (guint ## n *) mono_array_addr (array, char, 0);     \
+       guint ## n *data = (guint ## n *) mono_array_addr (MONO_HANDLE_RAW(array), char, 0); \
        guint ## n *src = (guint ## n *) field_data;                            \
        int i,                                                                  \
            nEnt = (size / sizeof(guint ## n));                                 \
@@ -904,11 +900,11 @@ ves_icall_System_Runtime_CompilerServices_RuntimeHelpers_InitializeArray (MonoAr
                SWAP (64);
                break;
        default:
-               memcpy (mono_array_addr (array, char, 0), field_data, size);
+               memcpy (mono_array_addr (MONO_HANDLE_RAW(array), char, 0), field_data, size);
                break;
        }
 #else
-       memcpy (mono_array_addr (array, char, 0), field_data, size);
+       memcpy (mono_array_addr (MONO_HANDLE_RAW(array), char, 0), field_data, size);
 #endif
 }