2007-09-12 Marek Safar <marek.safar@gmail.com>

	* icall.c (ves_icall_MonoType_GetGenericArguments): Create an instance
	of Type array and not MonoType, a fix suggested by Hari.

svn path=/trunk/mono/; revision=85702

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 7da0d99c1a180f29de2f7ca9aaff8bb2c91e35bd..32dd6fcf00161d5ac4c94f8a417913c8affe8685 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12  Marek Safar  <marek.safar@gmail.com>
+
+       * icall.c (ves_icall_MonoType_GetGenericArguments): Create an instance
+       of Type array and not MonoType, a fix suggested by Hari.
+       
 2007-09-12  Jonathan Chambers <joncham@gmail.com>
 
        * domain-internals.h, domain.c : Remove delegate_invoke_impl_with_target_hash

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index a06184e156d251c49f389015aa53d378fe9aae92..5580692479fff3b5cb9aff7f7d192a21d235e194 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -2006,18 +2006,18 @@ ves_icall_MonoType_GetGenericArguments (MonoReflectionType *type)
 
        if (klass->generic_container) {
                MonoGenericContainer *container = klass->generic_container;
-               res = mono_array_new (mono_object_domain (type), mono_defaults.monotype_class, container->type_argc);
+               res = mono_array_new (mono_object_domain (type), mono_defaults.systemtype_class, container->type_argc);
                for (i = 0; i < container->type_argc; ++i) {
                        pklass = mono_class_from_generic_parameter (&container->type_params [i], klass->image, FALSE);
                        mono_array_setref (res, i, mono_type_get_object (mono_object_domain (type), &pklass->byval_arg));
                }
        } else if (klass->generic_class) {
                MonoGenericInst *inst = klass->generic_class->context.class_inst;
-               res = mono_array_new (mono_object_domain (type), mono_defaults.monotype_class, inst->type_argc);
+               res = mono_array_new (mono_object_domain (type), mono_defaults.systemtype_class, inst->type_argc);
                for (i = 0; i < inst->type_argc; ++i)
                        mono_array_setref (res, i, mono_type_get_object (mono_object_domain (type), inst->type_argv [i]));
        } else {
-               res = mono_array_new (mono_object_domain (type), mono_defaults.monotype_class, 0);
+               res = mono_array_new (mono_object_domain (type), mono_defaults.systemtype_class, 0);
        }
        return res;
 }