Author: raja
Date: 2007-07-12 10:21:40 -0400 (Thu, 12 Jul 2007)
New Revision: 81873
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/class-internals.h
trunk/mono/mono/metadata/metadata.c
trunk/mono/mono/metadata/reflection.c
Log:
* class-internals.h (_MonoGenericInst::is_reference): Remove bogus field.
* metadata.c, reflection.c: Update to changes.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2007-07-12 13:52:47 UTC (rev 81872)
+++ trunk/mono/mono/metadata/ChangeLog 2007-07-12 14:21:40 UTC (rev 81873)
@@ -1,3 +1,9 @@
+2007-07-12 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * class-internals.h (_MonoGenericInst::is_reference): Remove bogus
+ field.
+ * metadata.c, reflection.c: Update to changes.
+
2007-07-11 Rodrigo Kumpera <[EMAIL PROTECTED]>
* class.c, class-internal.h: added mono_type_is_valid_enum_basetype and
Modified: trunk/mono/mono/metadata/class-internals.h
===================================================================
--- trunk/mono/mono/metadata/class-internals.h 2007-07-12 13:52:47 UTC (rev
81872)
+++ trunk/mono/mono/metadata/class-internals.h 2007-07-12 14:21:40 UTC (rev
81873)
@@ -358,7 +358,6 @@
guint id; /* unique ID for debugging */
guint type_argc : 22; /* number of type arguments */
guint is_open : 1; /* if this is an open type */
- guint is_reference : 1; /* if this is a reference type */
MonoType **type_argv;
};
Modified: trunk/mono/mono/metadata/metadata.c
===================================================================
--- trunk/mono/mono/metadata/metadata.c 2007-07-12 13:52:47 UTC (rev 81872)
+++ trunk/mono/mono/metadata/metadata.c 2007-07-12 14:21:40 UTC (rev 81873)
@@ -1390,7 +1390,7 @@
const MonoGenericInst *b = (const MonoGenericInst *) kb;
int i;
- if ((a->is_open != b->is_open) || (a->type_argc != b->type_argc) ||
(a->is_reference != b->is_reference))
+ if (a->is_open != b->is_open || a->type_argc != b->type_argc)
return FALSE;
for (i = 0; i < a->type_argc; ++i) {
if (!do_mono_metadata_type_equal (a->type_argv [i],
b->type_argv [i], FALSE))
@@ -2059,15 +2059,12 @@
nginst = g_new0 (MonoGenericInst, 1);
nginst->type_argc = ginst->type_argc;
nginst->type_argv = g_new0 (MonoType*, nginst->type_argc);
- nginst->is_reference = 1;
for (i = 0; i < nginst->type_argc; i++) {
MonoType *t = mono_class_inflate_generic_type (ginst->type_argv
[i], context);
if (!nginst->is_open)
nginst->is_open = mono_class_is_open_constructed_type
(t);
- if (nginst->is_reference)
- nginst->is_reference = MONO_TYPE_IS_REFERENCE (t);
nginst->type_argv [i] = t;
}
@@ -2085,7 +2082,6 @@
ginst = g_new0 (MonoGenericInst, 1);
ginst->type_argc = count;
ginst->type_argv = g_new0 (MonoType*, count);
- ginst->is_reference = 1;
for (i = 0; i < ginst->type_argc; i++) {
MonoType *t = mono_metadata_parse_type_full (m, container,
MONO_PARSE_TYPE, 0, ptr, &ptr);
@@ -2098,8 +2094,6 @@
ginst->type_argv [i] = t;
if (!ginst->is_open)
ginst->is_open = mono_class_is_open_constructed_type
(t);
- if (ginst->is_reference)
- ginst->is_reference = MONO_TYPE_IS_REFERENCE (t);
}
if (rptr)
@@ -3472,7 +3466,7 @@
MonoGenericInst *i1 = g1->context.class_inst;
MonoGenericInst *i2 = g2->context.class_inst;
- if (i1->type_argc != i2->type_argc || g1->is_dynamic != g2->is_dynamic
|| i1->is_reference != i2->is_reference)
+ if (i1->type_argc != i2->type_argc || g1->is_dynamic != g2->is_dynamic)
return FALSE;
if (!mono_metadata_class_equal (g1->container_class,
g2->container_class, signature_only))
return FALSE;
@@ -4716,7 +4710,6 @@
nginst = g_new0 (MonoGenericInst, 1);
nginst->type_argc = container->type_argc;
nginst->type_argv = g_new0 (MonoType *, nginst->type_argc);
- nginst->is_reference = 1;
nginst->is_open = 1;
for (i = 0; i < nginst->type_argc; i++) {
Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c 2007-07-12 13:52:47 UTC (rev
81872)
+++ trunk/mono/mono/metadata/reflection.c 2007-07-12 14:21:40 UTC (rev
81873)
@@ -8787,15 +8787,12 @@
inst = g_new0 (MonoGenericInst, 1);
inst->type_argc = type_argc;
inst->type_argv = g_new0 (MonoType *, inst->type_argc);
- inst->is_reference = 1;
for (i = 0; i < inst->type_argc; ++i) {
MonoType *t = dup_type (types [i]);
if (!inst->is_open)
inst->is_open = mono_class_is_open_constructed_type (t);
- if (inst->is_reference)
- inst->is_reference = MONO_TYPE_IS_REFERENCE (t);
inst->type_argv [i] = t;
}
@@ -8869,15 +8866,12 @@
ginst = g_new0 (MonoGenericInst,1 );
ginst->type_argc = count;
ginst->type_argv = g_new0 (MonoType *, count);
- ginst->is_reference = 1;
for (i = 0; i < count; i++) {
MonoReflectionType *garg = mono_array_get (types, gpointer, i);
ginst->type_argv [i] = dup_type (garg->type);
if (!ginst->is_open)
ginst->is_open = mono_class_is_open_constructed_type
(ginst->type_argv [i]);
- if (ginst->is_reference)
- ginst->is_reference = MONO_TYPE_IS_REFERENCE
(ginst->type_argv [i]);
}
ginst = mono_metadata_lookup_generic_inst (ginst);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
