From b4b971d19aaa8fd67e30a71fa05746bc48204df6 Mon Sep 17 00:00:00 2001 From: zoltan Date: Sat, 8 Mar 2008 12:19:07 +0000 Subject: [PATCH] 2008-03-08 Zoltan Varga * class.c (mono_class_setup_mono_type): Improve the test for corlib. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@97750 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/metadata/ChangeLog | 4 ++++ mono/metadata/class.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index c13b5b565..8608fa3e0 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,7 @@ +2008-03-08 Zoltan Varga + + * class.c (mono_class_setup_mono_type): Improve the test for corlib. + 2008-03-07 Zoltan Varga * class.c (mono_class_setup_mono_type): Handle types whose name clashes with diff --git a/mono/metadata/class.c b/mono/metadata/class.c index 7ae4d6b06..877d73cc5 100644 --- a/mono/metadata/class.c +++ b/mono/metadata/class.c @@ -3645,7 +3645,12 @@ mono_class_setup_mono_type (MonoClass *class) { const char *name = class->name; const char *nspace = class->name_space; - gboolean is_corlib = class->image->assembly && !strcmp (class->image->assembly->aname.name, "mscorlib"); + gboolean is_corlib; + + if (class->image->dynamic) + is_corlib = class->image->assembly && !strcmp (class->image->assembly->aname.name, "mscorlib"); + else + is_corlib = class->image == mono_defaults.corlib; class->this_arg.byref = 1; class->this_arg.data.klass = class; -- 2.11.4.GIT