2003-09-29 Zoltan Varga <vargaz@freemail.hu>

	* TypeBuilder.cs: Really fix #48695.

svn path=/trunk/mcs/; revision=18386

diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
index cb02413134656a51a36e7581f672c095553d308d..39a1ae24c0c86be7273a11e2467ba5957910c05c 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/ChangeLog
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -1,3 +1,6 @@
+2003-09-29  Zoltan Varga  <vargaz@freemail.hu>
+
+       * TypeBuilder.cs: Really fix #48695.
 
 Sat Sep 27 16:17:08 CEST 2003 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 598458145098218a61022fedaa9646d510b85694..e1956498c86f43c2e4025896534eb4048209fa6d 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -338,10 +338,15 @@ namespace System.Reflection.Emit {
                {
                        ConstructorBuilder cb = DefineConstructor (attributes, CallingConventions.Standard, null);
 
-                       ConstructorInfo parent_constructor = null;
+                       Type parent_type;
 
                        if (parent != null)
-                               parent_constructor = parent.GetConstructor (
+                               parent_type = parent;
+                       else
+                               parent_type = pmodule.assemblyb.corlib_object_type;
+
+                       ConstructorInfo parent_constructor =
+                               parent_type.GetConstructor (
                                        BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance,
                                        null, Type.EmptyTypes, null);