Merge pull request #3528 from BrzVlad/fix-sgen-check-before-collections

[mono.git] / mcs / class / corlib / System.Reflection.Emit / TypeBuilder.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
index 27553b18c7ea8bfcdab3acb52c447b299ed3c3ec..3972192308d8082a7c6be66c929a8989b4a85dce 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -93,14 +93,8 @@ namespace System.Reflection.Emit
                }
                
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void setup_internal_class (TypeBuilder tb);
+               private extern void setup_internal_class ();
                
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void create_internal_class (TypeBuilder tb);
-               
-               [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern void setup_generic_class ();
-
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern void create_generic_class ();
 
@@ -117,13 +111,13 @@ namespace System.Reflection.Emit
                        this.nspace = String.Empty;
                        this.fullname = TypeIdentifiers.WithoutEscape(this.tname);
                        pmodule = mb;
-                       setup_internal_class (this);
+                       setup_internal_class ();
                }
 
                internal TypeBuilder (ModuleBuilder mb, string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packing_size, int type_size, Type nesting_type)
                {
                        int sep_index;
-                       this.parent = parent;
+                       this.parent = ResolveUserType (parent);
                        this.attrs = attr;
                        this.class_size = type_size;
                        this.packing_size = packing_size;
@@ -153,7 +147,7 @@ namespace System.Reflection.Emit
 
                        // skip .<Module> ?
                        table_idx = mb.get_next_table_index (this, 0x02, true);
-                       setup_internal_class (this);
+                       setup_internal_class ();
                        fullname = GetFullName ();
                }
 
@@ -672,7 +666,6 @@ namespace System.Reflection.Emit
                                fields = new FieldBuilder [1];
                                fields [0] = res;
                                num_fields ++;
-                               create_internal_class (this);
                        }
 
                        if (IsEnum) {
@@ -728,7 +721,7 @@ namespace System.Reflection.Emit
                }
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private extern TypeInfo create_runtime_class (TypeBuilder tb);
+               private extern TypeInfo create_runtime_class ();
 
                private bool is_nested_in (Type t)
                {
@@ -832,12 +825,54 @@ namespace System.Reflection.Emit
                                        ctor.fixup ();
                        }
 
-                       created = create_runtime_class (this);
+                       ResolveUserTypes ();
+
+                       created = create_runtime_class ();
                        if (created != null)
                                return created;
                        return this;
                }
 
+               void ResolveUserTypes () {
+                       parent = ResolveUserType (parent);
+                       ResolveUserTypes (interfaces);
+                       if (fields != null) {
+                               foreach (var fb in fields) {
+                                       if (fb != null)
+                                               fb.ResolveUserTypes ();
+                               }
+                       }
+                       if (methods != null) {
+                               foreach (var mb in methods) {
+                                       if (mb != null)
+                                               mb.ResolveUserTypes ();
+                               }
+                       }
+                       if (ctors != null) {
+                               foreach (var cb in ctors) {
+                                       if (cb != null)
+                                               cb.ResolveUserTypes ();
+                               }
+                       }
+               }
+
+               static internal void ResolveUserTypes (Type[] types) {
+                       if (types != null)
+                               for (int i = 0; i < types.Length; ++i)
+                                       types [i] = ResolveUserType (types [i]);
+               }
+
+               static internal Type ResolveUserType (Type t) {
+                       if (t != null && ((t.GetType ().Assembly != typeof (int).Assembly) || (t is TypeDelegator))) {
+                               t = t.UnderlyingSystemType;
+                               if (t != null && ((t.GetType ().Assembly != typeof (int).Assembly) || (t is TypeDelegator)))
+                                       throw new NotSupportedException ("User defined subclasses of System.Type are not yet supported.");
+                               return t;
+                       } else {
+                               return t;
+                       }
+               }
+
                internal void GenerateDebugInfo (ISymbolWriter symbolWriter)
                {
                        symbolWriter.OpenNamespace (this.Namespace);
@@ -1606,9 +1641,10 @@ namespace System.Reflection.Emit
                        } else {
                                this.parent = parent;
                        }
+                       this.parent = ResolveUserType (this.parent);
 
                        // will just set the parent-related bits if called a second time
-                       setup_internal_class (this);
+                       setup_internal_class ();
                }
 
                internal int get_next_table_index (object obj, int table, bool inc) {
@@ -1767,8 +1803,6 @@ namespace System.Reflection.Emit
                        if (names.Length == 0)
                                throw new ArgumentException ("names");
 
-                       setup_generic_class ();
-
                        generic_params = new GenericTypeParameterBuilder [names.Length];
                        for (int i = 0; i < names.Length; i++) {
                                string item = names [i];