Small bug fix, to render better an acurrate error
[mono.git] / mcs / mcs / typemanager.cs
index 697242a02e07641ae951fb54a278b9f7a826c88d..58f9a0168cc7ed2386ff67a511741714f536acbd 100755 (executable)
@@ -9,13 +9,21 @@
 // (C) 2001 Ximian, Inc (http://www.ximian.com)
 //
 //
-#define CACHE
+
+//
+// We will eventually remove the SIMPLE_SPEEDUP, and should never change 
+// the behavior of the compilation.  This can be removed if we rework
+// the code to get a list of namespaces available.
+//
+#define SIMPLE_SPEEDUP
 
 using System;
+using System.IO;
 using System.Globalization;
 using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
@@ -53,6 +61,7 @@ public class TypeManager {
        static public Type icloneable_type;
        static public Type type_type;
        static public Type ienumerator_type;
+       static public Type ienumerable_type;
        static public Type idisposable_type;
        static public Type default_member_type;
        static public Type iasyncresult_type;
@@ -67,11 +76,14 @@ public class TypeManager {
        static public Type methodimpl_attr_type;
        static public Type marshal_as_attr_type;
        static public Type param_array_type;
+       static public Type guid_attr_type;
        static public Type void_ptr_type;
        static public Type indexer_name_type;
        static public Type exception_type;
+       static public Type invalid_operation_exception_type;
        static public object obsolete_attribute_type;
        static public object conditional_attribute_type;
+       static public Type in_attribute_type;
 
        //
        // An empty array of types
@@ -120,11 +132,15 @@ public class TypeManager {
        // These methods are called by code generated by the compiler
        //
        static public MethodInfo string_concat_string_string;
+       static public MethodInfo string_concat_string_string_string;
+       static public MethodInfo string_concat_string_string_string_string;
        static public MethodInfo string_concat_object_object;
        static public MethodInfo string_isinterneted_string;
        static public MethodInfo system_type_get_type_from_handle;
        static public MethodInfo object_getcurrent_void;
        static public MethodInfo bool_movenext_void;
+       static public MethodInfo ienumerable_getenumerator_void;
+       static public MethodInfo void_reset_void;
        static public MethodInfo void_dispose_void;
        static public MethodInfo void_monitor_enter_object;
        static public MethodInfo void_monitor_exit_object;
@@ -144,9 +160,11 @@ public class TypeManager {
        //
        // The attribute constructors.
        //
+       static public ConstructorInfo object_ctor;
        static public ConstructorInfo cons_param_array_attribute;
        static public ConstructorInfo void_decimal_ctor_five_args;
        static public ConstructorInfo unverifiable_code_ctor;
+       static public ConstructorInfo invalid_operation_ctor;
        
        // <remarks>
        //   Holds the Array of Assemblies that have been loaded
@@ -179,10 +197,7 @@ public class TypeManager {
        // </remarks>
        static ArrayList user_types;
 
-       // <remarks>
-       //   Keeps a mapping between TypeBuilders and their TypeContainers
-       // </remarks>
-       static PtrHashtable builder_to_container;
+       static PtrHashtable builder_to_declspace;
 
        // <remarks>
        //   Tracks the interfaces implemented by typebuilders.  We only
@@ -208,20 +223,6 @@ public class TypeManager {
        // <remarks>
        static Hashtable method_internal_params;
 
-       static PtrHashtable builder_to_interface;
-
-       // <remarks>
-       //  Keeps track of delegate types
-       // </remarks>
-
-       static Hashtable builder_to_delegate;
-
-       // <remarks>
-       //  Keeps track of enum types
-       // </remarks>
-
-       static Hashtable builder_to_enum;
-
        // <remarks>
        //  Keeps track of attribute types
        // </remarks>
@@ -288,24 +289,24 @@ public class TypeManager {
        //
        static void InitExpressionTypes ()
        {
-               system_object_expr  = new TypeExpression ("System.Object");
-               system_string_expr  = new TypeExpression ("System.String");
-               system_boolean_expr = new TypeExpression ("System.Boolean");
-               system_decimal_expr = new TypeExpression ("System.Decimal");
-               system_single_expr  = new TypeExpression ("System.Single");
-               system_double_expr  = new TypeExpression ("System.Double");
-               system_sbyte_expr   = new TypeExpression ("System.SByte");
-               system_byte_expr    = new TypeExpression ("System.Byte");
-               system_int16_expr   = new TypeExpression ("System.Int16");
-               system_uint16_expr  = new TypeExpression ("System.UInt16");
-               system_int32_expr   = new TypeExpression ("System.Int32");
-               system_uint32_expr  = new TypeExpression ("System.UInt32");
-               system_int64_expr   = new TypeExpression ("System.Int64");
-               system_uint64_expr  = new TypeExpression ("System.UInt64");
-               system_char_expr    = new TypeExpression ("System.Char");
-               system_void_expr    = new TypeExpression ("System.Void");
-               system_asynccallback_expr = new TypeExpression ("System.AsyncCallback");
-               system_iasyncresult_expr = new TypeExpression ("System.IAsyncResult");
+               system_object_expr  = new TypeLookupExpression ("System.Object");
+               system_string_expr  = new TypeLookupExpression ("System.String");
+               system_boolean_expr = new TypeLookupExpression ("System.Boolean");
+               system_decimal_expr = new TypeLookupExpression ("System.Decimal");
+               system_single_expr  = new TypeLookupExpression ("System.Single");
+               system_double_expr  = new TypeLookupExpression ("System.Double");
+               system_sbyte_expr   = new TypeLookupExpression ("System.SByte");
+               system_byte_expr    = new TypeLookupExpression ("System.Byte");
+               system_int16_expr   = new TypeLookupExpression ("System.Int16");
+               system_uint16_expr  = new TypeLookupExpression ("System.UInt16");
+               system_int32_expr   = new TypeLookupExpression ("System.Int32");
+               system_uint32_expr  = new TypeLookupExpression ("System.UInt32");
+               system_int64_expr   = new TypeLookupExpression ("System.Int64");
+               system_uint64_expr  = new TypeLookupExpression ("System.UInt64");
+               system_char_expr    = new TypeLookupExpression ("System.Char");
+               system_void_expr    = new TypeLookupExpression ("System.Void");
+               system_asynccallback_expr = new TypeLookupExpression ("System.AsyncCallback");
+               system_iasyncresult_expr = new TypeLookupExpression ("System.IAsyncResult");
        }
        
        static TypeManager ()
@@ -317,15 +318,12 @@ public class TypeManager {
                types = new Hashtable ();
                typecontainers = new Hashtable ();
                
-               builder_to_interface = new PtrHashtable ();
-               builder_to_delegate = new PtrHashtable ();
-               builder_to_enum  = new PtrHashtable ();
+               builder_to_declspace = new PtrHashtable ();
                builder_to_attr = new PtrHashtable ();
                builder_to_method = new PtrHashtable ();
                method_arguments = new PtrHashtable ();
                method_internal_params = new PtrHashtable ();
                indexer_arguments = new PtrHashtable ();
-               builder_to_container = new PtrHashtable ();
                builder_to_ifaces = new PtrHashtable ();
                
                NoTypes = new Type [0];
@@ -340,7 +338,7 @@ public class TypeManager {
                        types.Add (name, t);
                } catch {
                        Type prev = (Type) types [name];
-                       TypeContainer tc = (TypeContainer) builder_to_container [prev];
+                       TypeContainer tc = builder_to_declspace [prev] as TypeContainer;
 
                        if (tc != null){
                                //
@@ -350,7 +348,7 @@ public class TypeManager {
                                return;
                        }
 
-                       tc = (TypeContainer) builder_to_container [t];
+                       tc = builder_to_declspace [t] as TypeContainer;
                        
                        Report.Warning (
                                1595, "The type `" + name + "' is defined in an existing assembly;"+
@@ -377,7 +375,7 @@ public class TypeManager {
        
        public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
        {
-               builder_to_container.Add (t, tc);
+               builder_to_declspace.Add (t, tc);
                typecontainers.Add (name, tc);
                AddUserType (name, t, ifaces);
        }
@@ -385,19 +383,19 @@ public class TypeManager {
        public static void AddDelegateType (string name, TypeBuilder t, Delegate del)
        {
                types.Add (name, t);
-               builder_to_delegate.Add (t, del);
+               builder_to_declspace.Add (t, del);
        }
        
        public static void AddEnumType (string name, TypeBuilder t, Enum en)
        {
                types.Add (name, t);
-               builder_to_enum.Add (t, en);
+               builder_to_declspace.Add (t, en);
        }
 
        public static void AddUserInterface (string name, TypeBuilder t, Interface i, Type [] ifaces)
        {
                AddUserType (name, t, ifaces);
-               builder_to_interface.Add (t, i);
+               builder_to_declspace.Add (t, i);
        }
 
        public static void AddMethod (MethodBuilder builder, MethodData method)
@@ -416,22 +414,33 @@ public class TypeManager {
        /// </summary>
        public static TypeContainer LookupTypeContainer (Type t)
        {
-               return (TypeContainer) builder_to_container [t];
+               return builder_to_declspace [t] as TypeContainer;
+       }
+
+       public static IMemberContainer LookupMemberContainer (Type t)
+       {
+               if (t is TypeBuilder) {
+                       IMemberContainer container = builder_to_declspace [t] as IMemberContainer;
+                       if (container != null)
+                               return container;
+               }
+
+               return TypeHandle.GetTypeHandle (t);
        }
 
        public static Interface LookupInterface (Type t)
        {
-               return (Interface) builder_to_interface [t];
+               return builder_to_declspace [t] as Interface;
        }
 
        public static Delegate LookupDelegate (Type t)
        {
-               return (Delegate) builder_to_delegate [t];
+               return builder_to_declspace [t] as Delegate;
        }
 
        public static Enum LookupEnum (Type t)
        {
-               return (Enum) builder_to_enum [t];
+               return builder_to_declspace [t] as Enum;
        }
        
        public static TypeContainer LookupAttr (Type t)
@@ -467,8 +476,132 @@ public class TypeManager {
                modules = n;
        }
 
+       static Hashtable references = new Hashtable ();
+       
+       //
+       // Gets the reference to T version of the Type (T&)
+       //
+       public static Type GetReferenceType (Type t)
+       {
+               string tname = t.FullName + "&";
+               
+               Type ret = t.Assembly.GetType (tname);
+
+               //
+               // If the type comes from the assembly we are building
+               // We need the Hashtable, because .NET 1.1 will return different instance types
+               // every time we call ModuleBuilder.GetType.
+               //
+               if (ret == null){
+                       if (references [t] == null)
+                               references [t] = CodeGen.ModuleBuilder.GetType (tname);
+                       ret = (Type) references [t];
+               }
+
+               return ret;
+       }
+
+       static Hashtable pointers = new Hashtable ();
+
+       //
+       // Gets the pointer to T version of the Type  (T*)
+       //
+       public static Type GetPointerType (Type t)
+       {
+               string tname = t.FullName + "*";
+               
+               Type ret = t.Assembly.GetType (tname);
+               
+               //
+               // If the type comes from the assembly we are building
+               // We need the Hashtable, because .NET 1.1 will return different instance types
+               // every time we call ModuleBuilder.GetType.
+               //
+               if (ret == null){
+                       if (pointers [t] == null)
+                               pointers [t] = CodeGen.ModuleBuilder.GetType (tname);
+                       
+                       ret = (Type) pointers [t];
+               }
+
+               return ret;
+       }
+       
+       //
+       // Low-level lookup, cache-less
+       //
+       static Type LookupTypeReflection (string name)
+       {
+               Type t;
+
+               foreach (Assembly a in assemblies){
+                       t = a.GetType (name);
+                       if (t != null)
+                               return t;
+               }
+
+               foreach (ModuleBuilder mb in modules) {
+                       t = mb.GetType (name);
+                       if (t != null){
+                               return t;
+                       }
+               }
+               return null;
+       }
+
+       static Hashtable negative_hits = new Hashtable ();
+       
+       //
+       // This function is used when you want to avoid the lookups, and want to go
+       // directly to the source.  This will use the cache.
+       //
+       // Notice that bypassing the cache is bad, because on Microsoft.NET runtime
+       // GetType ("DynamicType[]") != GetType ("DynamicType[]"), and there is no
+       // way to test things other than doing a fullname compare
+       //
+       public static Type LookupTypeDirect (string name)
+       {
+               Type t = (Type) types [name];
+               if (t != null)
+                       return t;
+
+               t = LookupTypeReflection (name);
+               if (t == null)
+                       return null;
+
+               types [name] = t;
+               return t;
+       }
+
+       //
+       // UNUSED: This version tries to reduce the impact of calling LookupType by validating if
+       // UNUSED: the namespace exists
+       //
+       public static Type xLookupType (string ns, string name, out string res)
+       {
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               
+               if (!IsNamespace (ns)){
+                       res = null;
+                       return null;
+               }
+
+               res = DeclSpace.MakeFQN (ns, name);
+               return LookupType (res);
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+               // CURRENTLY UNUSED
+       }
+
        /// <summary>
-       ///   Returns the Type associated with @name
+       ///   Returns the Type associated with @name, takes care of the fact that
+       ///   reflection expects nested types to be separated from the main type
+       ///   with a "+" instead of a "."
        /// </summary>
        public static Type LookupType (string name)
        {
@@ -482,24 +615,173 @@ public class TypeManager {
                if (t != null)
                        return t;
 
-               foreach (Assembly a in assemblies){
-                       t = a.GetType (name);
-                       if (t != null){
-                               types [name] = t;
+               // Two thirds of the failures are caught here.
+               if (negative_hits.Contains (name))
+                       return null;
+
+               string [] elements = name.Split ('.');
+               int count = elements.Length;
+
+               for (int n = 1; n <= count; n++){
+                       string top_level_type = String.Join (".", elements, 0, n);
 
+                       // One third of the failures are caught here.
+                       if (negative_hits.Contains (top_level_type))
+                               continue;
+                       
+                       t = (Type) types [top_level_type];
+                       if (t == null){
+                               t = LookupTypeReflection (top_level_type);
+                               if (t == null){
+                                       negative_hits [top_level_type] = true;
+                                       continue;
+                               }
+                       }
+                       
+                       if (count == n){
+                               types [name] = t;
                                return t;
+                       } 
+
+                       //
+                       // We know that System.Object does not have children, and since its the parent of 
+                       // all the objects, it always gets probbed for inner classes. 
+                       //
+                       if (top_level_type == "System.Object")
+                               return null;
+                       
+                       string newt = top_level_type + "+" + String.Join ("+", elements, n, count - n);
+                       //Console.WriteLine ("Looking up: " + newt + " " + name);
+                       t = LookupTypeReflection (newt);
+                       if (t == null)
+                               negative_hits [name] = true;
+                       else
+                               types [name] = t;
+                       return t;
+               }
+               negative_hits [name] = true;
+               return null;
+       }
+
+       // Total list of known namespaces for the compilation 
+       static string [] namespaces;
+
+       static Hashtable AddModuleNamespaces (Hashtable h)
+       {
+               foreach (ModuleBuilder mb in modules){
+                       foreach (Type t in mb.GetTypes ()){
+                               string ns = t.Namespace;
+
+                               if (h.Contains (ns))
+                                       continue;
+                               h [ns] = ns;
                        }
                }
+               return h;
+       }
+       
+       
+       /// <summary>
+       ///   Computes the namespaces that we import from the assemblies we reference.
+       /// </summary>
+       public static void ComputeNamespaces ()
+       {
+               MethodInfo assembly_get_namespaces = typeof (Assembly).GetMethod ("GetNamespaces");
 
-               foreach (ModuleBuilder mb in modules) {
-                       t = mb.GetType (name);
-                       if (t != null) {
-                               types [name] = t;
-                               return t;
+               //
+               // First add the assembly namespaces
+               //
+               Hashtable namespaces_hash = new Hashtable ();
+               if (assembly_get_namespaces != null){
+                       int count = assemblies.Length;
+                       int total;
+
+                       for (int i = 0; i < count; i++){
+                               Assembly a = assemblies [i];
+                               string [] namespaces = (string []) assembly_get_namespaces.Invoke (a, null);
+                               foreach (string ns in namespaces){
+                                       if (ns == "")
+                                               continue;
+                                       if (namespaces_hash.Contains (ns))
+                                               continue;
+                                       namespaces_hash [ns] = true;
+                               }
+                       }
+               } else {
+                       foreach (Assembly a in assemblies){
+                               foreach (Type t in a.GetTypes ()){
+                                       string ns = t.Namespace;
+
+                                       // t.Namespace returns null for <PrivateImplDetails>
+                                       if (ns == ""|| ns == null)
+                                               continue;
+                                       if (namespaces_hash.Contains (ns))
+                                               continue;
+                                       namespaces_hash [ns] = true;
+                               }
+                       }
+               }
+               //
+               // Now insert all the namespaces defined by the application
+               //
+               StringBuilder s = null;
+               foreach (Namespace ns in Namespace.UserDefinedNamespaces){
+                       string name = ns.Name;
+                       if (name == "")
+                               continue;
+                       if (name == null)
+                               throw new Exception ();
+                       if (namespaces_hash.Contains (name))
+                               continue;
+                       
+                       if (name.IndexOf ('.') != -1){
+                               if (s == null)
+                                       s = new StringBuilder ();
+                               string [] pieces = name.Split ('.');
+                               for (int i = 1; i < pieces.Length; i++){
+                                       s.Length = 0;
+                               
+                                       s.Append (pieces [0]);
+                                       for (int j = 1; j < i; j++){
+                                               s.Append (".");
+                                               s.Append (pieces [j]);
+                                       }
+                                       string n = s.ToString ();
+                                       if (namespaces_hash.Contains (n))
+                                               continue;
+                                       namespaces_hash [n] = true;
+                               }
                        }
+                       
+                       namespaces_hash [name] = true;
+               }
+
+               //
+               // Store it sorted
+               //
+               int idx = 0;
+               TypeManager.namespaces = new string [namespaces_hash.Count];
+               foreach (string ns in namespaces_hash.Keys){
+                       namespaces [idx++] = ns;
                }
+               Array.Sort (namespaces);
+       }
+
+       public static bool IsNamespace (string name)
+       {
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
                
-               return null;
+               return true;
+       }
+
+       public static bool NamespaceClash (string name)
+       {
+               if (Array.BinarySearch (namespaces, name) < 0)
+                       return false;
+
+               Report.Error (519, String.Format ("`{0}' clashes with a predefined namespace", name));
+               return true;
        }
 
        /// <summary>
@@ -509,7 +791,7 @@ public class TypeManager {
        {
                return Regex.Replace (t.FullName, 
                        @"^System\." +
-                       @"(Int32|UInt32|Int16|Uint16|Int64|UInt64|" +
+                       @"(Int32|UInt32|Int16|UInt16|Int64|UInt64|" +
                        @"Single|Double|Char|Decimal|Byte|SByte|Object|" +
                        @"Boolean|String|Void)" +
                        @"(\W+|\b)", 
@@ -566,7 +848,7 @@ public class TypeManager {
        /// </summary>
        static Type CoreLookupType (string name)
        {
-               Type t = LookupType (name);
+               Type t = LookupTypeDirect (name);
 
                if (t == null){
                        Report.Error (518, "The predefined type `" + name + "' is not defined or imported");
@@ -582,21 +864,26 @@ public class TypeManager {
        /// </summary>
        static MethodInfo GetMethod (Type t, string name, Type [] args)
        {
-               MemberInfo [] mi;
+               MemberList list;
                Signature sig;
 
                sig.name = name;
                sig.args = args;
                
-               mi = FindMembers (
-                       t, MemberTypes.Method,
-                       instance_and_static | BindingFlags.Public, signature_filter, sig);
-               if (mi == null || mi.Length == 0 || !(mi [0] is MethodInfo)){
+               list = FindMembers (t, MemberTypes.Method, instance_and_static | BindingFlags.Public,
+                                   signature_filter, sig);
+               if (list.Count == 0) {
                        Report.Error (-19, "Can not find the core function `" + name + "'");
                        return null;
                }
 
-               return (MethodInfo) mi [0];
+               MethodInfo mi = list [0] as MethodInfo;
+               if (mi == null) {
+                       Report.Error (-19, "Can not find the core function `" + name + "'");
+                       return null;
+               }
+
+               return mi;
        }
 
        /// <summary>
@@ -604,20 +891,27 @@ public class TypeManager {
        /// </summary>
        static ConstructorInfo GetConstructor (Type t, Type [] args)
        {
-               MemberInfo [] mi;
+               MemberList list;
                Signature sig;
 
                sig.name = ".ctor";
                sig.args = args;
                
-               mi = FindMembers (t, MemberTypes.Constructor,
-                                 instance_and_static | BindingFlags.Public | BindingFlags.DeclaredOnly, signature_filter, sig);
-               if (mi == null || mi.Length == 0 || !(mi [0] is ConstructorInfo)){
+               list = FindMembers (t, MemberTypes.Constructor,
+                                   instance_and_static | BindingFlags.Public | BindingFlags.DeclaredOnly,
+                                   signature_filter, sig);
+               if (list.Count == 0){
+                       Report.Error (-19, "Can not find the core constructor for type `" + t.Name + "'");
+                       return null;
+               }
+
+               ConstructorInfo ci = list [0] as ConstructorInfo;
+               if (ci == null){
                        Report.Error (-19, "Can not find the core constructor for type `" + t.Name + "'");
                        return null;
                }
 
-               return (ConstructorInfo) mi [0];
+               return ci;
        }
 
        public static void InitEnumUnderlyingTypes ()
@@ -668,6 +962,7 @@ public class TypeManager {
                asynccallback_type   = CoreLookupType ("System.AsyncCallback");
                iasyncresult_type    = CoreLookupType ("System.IAsyncResult");
                ienumerator_type     = CoreLookupType ("System.Collections.IEnumerator");
+               ienumerable_type     = CoreLookupType ("System.Collections.IEnumerable");
                idisposable_type     = CoreLookupType ("System.IDisposable");
                icloneable_type      = CoreLookupType ("System.ICloneable");
                monitor_type         = CoreLookupType ("System.Threading.Monitor");
@@ -677,8 +972,15 @@ public class TypeManager {
                attribute_usage_type = CoreLookupType ("System.AttributeUsageAttribute");
                dllimport_type       = CoreLookupType ("System.Runtime.InteropServices.DllImportAttribute");
                methodimpl_attr_type = CoreLookupType ("System.Runtime.CompilerServices.MethodImplAttribute");
-               marshal_as_attr_type  = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
-               param_array_type      = CoreLookupType ("System.ParamArrayAttribute");
+               marshal_as_attr_type = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
+               param_array_type     = CoreLookupType ("System.ParamArrayAttribute");
+               in_attribute_type    = CoreLookupType ("System.Runtime.InteropServices.InAttribute");
+
+               //
+               // Sigh. Remove this before the release.  Wonder what versions of Mono
+               // people are running.
+               //
+               guid_attr_type        = LookupType ("System.Runtime.InteropServices.GuidAttribute");
 
                unverifiable_code_type= CoreLookupType ("System.Security.UnverifiableCodeAttribute");
 
@@ -687,6 +989,7 @@ public class TypeManager {
                indexer_name_type     = CoreLookupType ("System.Runtime.CompilerServices.IndexerNameAttribute");
 
                exception_type        = CoreLookupType ("System.Exception");
+               invalid_operation_exception_type = CoreLookupType ("System.InvalidOperationException");
 
                //
                // Attribute types
@@ -725,19 +1028,19 @@ public class TypeManager {
 
                        Type [] system_type_type_arg = { system_type_type, system_type_type, system_type_type };
 
-                       try {
                        system_void_set_corlib_type_builders = GetMethod (
                                system_assemblybuilder_type, "SetCorlibTypeBuilders",
                                system_type_type_arg);
 
-                       object[] args = new object [3];
-                       args [0] = object_type;
-                       args [1] = value_type;
-                       args [2] = enum_type;
-
-                       system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
-                       } catch {
-                               Console.WriteLine ("Corlib compilation is not supported in Microsoft.NET due to bugs in it");
+                       if (system_void_set_corlib_type_builders != null){
+                               object[] args = new object [3];
+                               args [0] = object_type;
+                               args [1] = value_type;
+                               args [2] = enum_type;
+                               
+                               system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+                       } else {
+                               Report.Error (-26, "Corlib compilation is not supported in Microsoft.NET due to bugs in it");
                        }
                }
        }
@@ -753,6 +1056,12 @@ public class TypeManager {
                Type [] string_string = { string_type, string_type };
                string_concat_string_string = GetMethod (
                        string_type, "Concat", string_string);
+               Type [] string_string_string = { string_type, string_type, string_type };
+               string_concat_string_string_string = GetMethod (
+                       string_type, "Concat", string_string_string);
+               Type [] string_string_string_string = { string_type, string_type, string_type, string_type };
+               string_concat_string_string_string_string = GetMethod (
+                       string_type, "Concat", string_string_string_string);
 
                Type [] object_object = { object_type, object_type };
                string_concat_object_object = GetMethod (
@@ -781,6 +1090,8 @@ public class TypeManager {
                        ienumerator_type, "get_Current", void_arg);
                bool_movenext_void = GetMethod (
                        ienumerator_type, "MoveNext", void_arg);
+               void_reset_void = GetMethod (
+                       ienumerator_type, "Reset", void_arg);
                void_dispose_void = GetMethod (
                        idisposable_type, "Dispose", void_arg);
                int_get_offset_to_string_data = GetMethod (
@@ -789,7 +1100,9 @@ public class TypeManager {
                        array_type, "get_Length", void_arg);
                int_array_get_rank = GetMethod (
                        array_type, "get_Rank", void_arg);
-
+               ienumerable_getenumerator_void = GetMethod (
+                       ienumerable_type, "GetEnumerator", void_arg);
+               
                //
                // Int32 arguments
                //
@@ -845,92 +1158,147 @@ public class TypeManager {
 
                unverifiable_code_ctor = GetConstructor (
                        unverifiable_code_type, void_arg);
-               
+
+               //
+               // InvalidOperationException
+               //
+               invalid_operation_ctor = GetConstructor (
+                       invalid_operation_exception_type, void_arg);
+
+
+               // Object
+               object_ctor = GetConstructor (object_type, void_arg);
+
        }
 
        const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
 
-       //
-       // FIXME: This can be optimized easily.  speedup by having a single builder mapping
-       //
-       public static MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
-                                                MemberFilter filter, object criteria)
+       static Hashtable type_hash = new Hashtable ();
+
+       /// <remarks>
+       ///   This is the "old", non-cache based FindMembers() function.  We cannot use
+       ///   the cache here because there is no member name argument.
+       /// </remarks>
+       public static MemberList FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+                                             MemberFilter filter, object criteria)
        {
+               DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+
+               //
+               // `builder_to_declspace' contains all dynamic types.
+               //
+               if (decl != null) {
+                       MemberList list;
+                       Timer.StartTimer (TimerType.FindMembers);
+                       list = decl.FindMembers (mt, bf, filter, criteria);
+                       Timer.StopTimer (TimerType.FindMembers);
+                       return list;
+               }
+
                //
                // We have to take care of arrays specially, because GetType on
                // a TypeBuilder array will return a Type, not a TypeBuilder,
                // and we can not call FindMembers on this type.
                //
                if (t.IsSubclassOf (TypeManager.array_type))
-                       return TypeManager.array_type.FindMembers (mt, bf, filter, criteria);
-               
-               if (!(t is TypeBuilder)){
-                       //
-                       // Since FindMembers will not lookup both static and instance
-                       // members, we emulate this behaviour here.
-                       //
-                       if ((bf & instance_and_static) == instance_and_static){
-                               MemberInfo [] i_members = t.FindMembers (
-                                       mt, bf & ~BindingFlags.Static, filter, criteria);
-
-                               int i_len = i_members.Length;
-                               if (i_len == 1){
-                                       MemberInfo one = i_members [0];
-
-                                       //
-                                       // If any of these are present, we are done!
-                                       //
-                                       if ((one is Type) || (one is EventInfo) || (one is FieldInfo))
-                                               return i_members;
-                               }
+                       return new MemberList (TypeManager.array_type.FindMembers (mt, bf, filter, criteria));
+
+               //
+               // Since FindMembers will not lookup both static and instance
+               // members, we emulate this behaviour here.
+               //
+               if ((bf & instance_and_static) == instance_and_static){
+                       MemberInfo [] i_members = t.FindMembers (
+                               mt, bf & ~BindingFlags.Static, filter, criteria);
+
+                       int i_len = i_members.Length;
+                       if (i_len == 1){
+                               MemberInfo one = i_members [0];
+
+                               //
+                               // If any of these are present, we are done!
+                               //
+                               if ((one is Type) || (one is EventInfo) || (one is FieldInfo))
+                                       return new MemberList (i_members);
+                       }
                                
-                               MemberInfo [] s_members = t.FindMembers (
-                                       mt, bf & ~BindingFlags.Instance, filter, criteria);
-
-                               int s_len = s_members.Length;
-                               if (i_len > 0 || s_len > 0){
-                                       MemberInfo [] both = new MemberInfo [i_len + s_len];
-
-                                       i_members.CopyTo (both, 0);
-                                       s_members.CopyTo (both, i_len);
-
-                                       return both;
-                               } else {
-                                       if (i_len > 0)
-                                               return i_members;
-                                       else
-                                               return s_members;
-                               }
+                       MemberInfo [] s_members = t.FindMembers (
+                               mt, bf & ~BindingFlags.Instance, filter, criteria);
+
+                       int s_len = s_members.Length;
+                       if (i_len > 0 || s_len > 0)
+                               return new MemberList (i_members, s_members);
+                       else {
+                               if (i_len > 0)
+                                       return new MemberList (i_members);
+                               else
+                                       return new MemberList (s_members);
                        }
-                       return t.FindMembers (mt, bf, filter, criteria);
                }
 
+               return new MemberList (t.FindMembers (mt, bf, filter, criteria));
+       }
+
+
+       /// <summary>
+       ///   This method is only called from within MemberLookup.  It tries to use the member
+       ///   cache if possible and falls back to the normal FindMembers if not.  The `used_cache'
+       ///   flag tells the caller whether we used the cache or not.  If we used the cache, then
+       ///   our return value will already contain all inherited members and the caller don't need
+       ///   to check base classes and interfaces anymore.
+       /// </summary>
+       private static MemberList MemberLookup_FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+                                                           string name, out bool used_cache)
+       {
                //
-               // FIXME: We should not have builder_to_blah everywhere,
-               // we should just have a builder_to_findmemberizable
-               // and have them implement a new ICanFindMembers interface
+               // We have to take care of arrays specially, because GetType on
+               // a TypeBuilder array will return a Type, not a TypeBuilder,
+               // and we can not call FindMembers on this type.
                //
-               Enum e = (Enum) builder_to_enum [t];
+               if (t == TypeManager.array_type || t.IsSubclassOf (TypeManager.array_type)) {
+                       used_cache = true;
+                       return TypeHandle.ArrayType.MemberCache.FindMembers (
+                               mt, bf, name, FilterWithClosure_delegate, null);
+               }
 
-               if (e != null)
-                       return e.FindMembers (mt, bf, filter, criteria);
-               
-               Delegate del = (Delegate) builder_to_delegate [t];
+               //
+               // If this is a dynamic type, it's always in the `builder_to_declspace' hash table
+               // and we can ask the DeclSpace for the MemberCache.
+               //
+               if (t is TypeBuilder) {
+                       DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+                       MemberCache cache = decl.MemberCache;
+
+                       //
+                       // If this DeclSpace has a MemberCache, use it.
+                       //
 
-               if (del != null)
-                       return del.FindMembers (mt, bf, filter, criteria);
+                       if (cache != null) {
+                               used_cache = true;
+                               return cache.FindMembers (
+                                       mt, bf, name, FilterWithClosure_delegate, null);
+                       }
 
-               Interface iface = (Interface) builder_to_interface [t];
+                       // If there is no MemberCache, we need to use the "normal" FindMembers.
 
-               if (iface != null) 
-                       return iface.FindMembers (mt, bf, filter, criteria);
-               
-               TypeContainer tc = (TypeContainer) builder_to_container [t];
+                       MemberList list;
+                       Timer.StartTimer (TimerType.FindMembers);
+                       list = decl.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
+                                                FilterWithClosure_delegate, name);
+                       Timer.StopTimer (TimerType.FindMembers);
+                       used_cache = false;
+                       return list;
+               }
 
-               if (tc != null)
-                       return tc.FindMembers (mt, bf, filter, criteria);
+               //
+               // This call will always succeed.  There is exactly one TypeHandle instance per
+               // type, TypeHandle.GetTypeHandle() will either return it or create a new one
+               // if it didn't already exist.
+               //
+               TypeHandle handle = TypeHandle.GetTypeHandle (t);
 
-               return null;
+               used_cache = true;
+               return handle.MemberCache.FindMembers (mt, bf, name, FilterWithClosure_delegate, null);
        }
 
        public static bool IsBuiltinType (Type t)
@@ -944,6 +1312,21 @@ public class TypeManager {
                        return false;
        }
 
+       //
+       // This is like IsBuiltinType, but lacks decimal_type, we should also clean up
+       // the pieces in the code where we use IsBuiltinType and special case decimal_type.
+       // 
+       public static bool IsCLRType (Type t)
+       {
+               if (t == object_type || t == int32_type || t == uint32_type ||
+                   t == int64_type || t == uint64_type || t == float_type || t == double_type ||
+                   t == char_type || t == short_type || t == bool_type ||
+                   t == sbyte_type || t == byte_type || t == ushort_type)
+                       return true;
+               else
+                       return false;
+       }
+
        public static bool IsDelegateType (Type t)
        {
                if (t.IsSubclassOf (TypeManager.delegate_type))
@@ -954,15 +1337,55 @@ public class TypeManager {
        
        public static bool IsEnumType (Type t)
        {
-               if (t.IsSubclassOf (TypeManager.enum_type))
+               if (t == TypeManager.enum_type || t.IsSubclassOf (TypeManager.enum_type))
                        return true;
                else
                        return false;
        }
-       
+
+       //
+       // Whether a type is unmanaged.  This is used by the unsafe code (25.2)
+       //
+       public static bool IsUnmanagedType (Type t)
+       {
+               if (IsBuiltinType (t) && t != TypeManager.string_type)
+                       return true;
+
+               if (IsEnumType (t))
+                       return true;
+
+               if (t.IsPointer)
+                       return true;
+
+               if (IsValueType (t)){
+                       if (t is TypeBuilder){
+                               TypeContainer tc = LookupTypeContainer (t);
+
+                               foreach (Field f in tc.Fields){
+                                       if (f.FieldBuilder.IsStatic)
+                                               continue;
+                                       if (!IsUnmanagedType (f.FieldBuilder.FieldType))
+                                               return false;
+                               }
+                       } else {
+                               FieldInfo [] fields = t.GetFields ();
+
+                               foreach (FieldInfo f in fields){
+                                       if (f.IsStatic)
+                                               continue;
+                                       if (!IsUnmanagedType (f.FieldType))
+                                               return false;
+                               }
+                       }
+                       return true;
+               }
+
+               return false;
+       }
+               
        public static bool IsValueType (Type t)
        {
-               if (t.IsSubclassOf (TypeManager.value_type))
+               if (t.IsSubclassOf (TypeManager.value_type) && (t != TypeManager.enum_type))
                        return true;
                else
                        return false;
@@ -970,7 +1393,7 @@ public class TypeManager {
        
        public static bool IsInterfaceType (Type t)
        {
-               Interface iface = (Interface) builder_to_interface [t];
+               Interface iface = builder_to_declspace [t] as Interface;
 
                if (iface != null)
                        return true;
@@ -984,7 +1407,7 @@ public class TypeManager {
        public static bool IsSubclassOrNestedChildOf (Type type, Type parent)
        {
                do {
-                       if (type.IsSubclassOf (parent))
+                       if ((type == parent) || type.IsSubclassOf (parent))
                                return true;
 
                        // Handle nested types.
@@ -994,6 +1417,25 @@ public class TypeManager {
                return false;
        }
 
+       //
+       // Checks whether `type' is a nested child of `parent'.
+       //
+       public static bool IsNestedChildOf (Type type, Type parent)
+       {
+               if (type == parent)
+                       return false;
+
+               type = type.DeclaringType;
+               while (type != null) {
+                       if ((type == parent) || type.IsSubclassOf (parent))
+                               return true;
+
+                       type = type.DeclaringType;
+               }
+
+               return false;
+       }
+
        /// <summary>
        ///   Returns the User Defined Types
        /// </summary>
@@ -1009,6 +1451,38 @@ public class TypeManager {
                }
        }
 
+       static Hashtable attr_to_allowmult;
+
+       public static void RegisterAttributeAllowMultiple (Type attr_type, bool allow)
+       {
+               if (attr_to_allowmult == null)
+                       attr_to_allowmult = new PtrHashtable ();
+
+               if (attr_to_allowmult.Contains (attr_type))
+                       return;
+
+               attr_to_allowmult.Add (attr_type, allow);
+                              
+       }
+
+       public static bool AreMultipleAllowed (Type attr_type)
+       {
+               if (!(attr_type is TypeBuilder)) {
+                       System.Attribute [] attrs = System.Attribute.GetCustomAttributes (attr_type);
+
+                       foreach (System.Attribute tmp in attrs)
+                               if (tmp is AttributeUsageAttribute)
+                                       return ((AttributeUsageAttribute) tmp).AllowMultiple;
+
+                       return false;
+               }
+               
+               if (attr_to_allowmult == null)
+                       return false;
+
+               return (bool) attr_to_allowmult [attr_type];
+       }
+
        static Hashtable builder_to_constant;
 
        public static void RegisterConstant (FieldBuilder fb, Const c)
@@ -1184,7 +1658,7 @@ public class TypeManager {
 
                        return (MethodInfo) pair.Second;
                } else
-                       return ei.GetAddMethod ();
+                       return ei.GetRemoveMethod ();
        }
 
        static Hashtable priv_fields_events;
@@ -1232,57 +1706,6 @@ public class TypeManager {
                return true;
        }
 
-       //
-       // FIXME: we need to return the accessors depending on whether
-       // they are visible or not.
-       //
-       static public MethodInfo [] GetAccessors (PropertyInfo pi)
-       {
-               MethodInfo [] ret;
-
-               if (pi is PropertyBuilder){
-                       Pair pair = (Pair) properties [pi];
-
-                       ret = new MethodInfo [2];
-                       ret [0] = (MethodInfo) pair.First;
-                       ret [1] = (MethodInfo) pair.Second;
-
-                       return ret;
-               } else {
-                       MethodInfo [] mi = new MethodInfo [2];
-
-                       //
-                       // Why this and not pi.GetAccessors?
-                       // Because sometimes index 0 is the getter
-                       // sometimes it is 1
-                       //
-                       mi [0] = pi.GetGetMethod (true);
-                       mi [1] = pi.GetSetMethod (true);
-
-                       return mi;
-               }
-       }
-
-       static public MethodInfo GetPropertyGetter (PropertyInfo pi)
-       {
-               if (pi is PropertyBuilder){
-                       Pair de = (Pair) properties [pi];
-
-                       return (MethodInfo) de.Second;
-               } else
-                       return pi.GetSetMethod ();
-       }
-
-       static public MethodInfo GetPropertySetter (PropertyInfo pi)
-       {
-               if (pi is PropertyBuilder){
-                       Pair de = (Pair) properties [pi];
-
-                       return (MethodInfo) de.First;
-               } else
-                       return pi.GetGetMethod ();
-       }
-
        /// <summary>
        ///   Given an array of interface types, expand and eliminate repeated ocurrences
        ///   of an interface.  
@@ -1385,11 +1808,13 @@ public class TypeManager {
 
        // This is a custom version of Convert.ChangeType() which works
        // with the TypeBuilder defined types when compiling corlib.
-       public static object ChangeType (object value, Type conversionType)
+       public static object ChangeType (object value, Type conversionType, out bool error)
        {
-               if (!(value is IConvertible))
-                       throw new ArgumentException ();
-
+               if (!(value is IConvertible)){
+                       error = true;
+                       return null;
+               }
+               
                IConvertible convertValue = (IConvertible) value;
                CultureInfo ci = CultureInfo.CurrentCulture;
                NumberFormatInfo provider = ci.NumberFormat;
@@ -1400,6 +1825,7 @@ public class TypeManager {
                // the system type itself.  You cannot use Type.GetTypeCode()
                // on such a type - it'd always return TypeCode.Object.
                //
+               error = false;
                if (conversionType.Equals (typeof (Boolean)))
                        return (object)(convertValue.ToBoolean (provider));
                else if (conversionType.Equals (typeof (Byte)))
@@ -1433,7 +1859,8 @@ public class TypeManager {
                else if (conversionType.Equals (typeof (Object)))
                        return (object)(value);
                else 
-                       throw new InvalidCastException ();
+                       error = true;
+               return null;
        }
 
        //
@@ -1648,7 +2075,7 @@ public class TypeManager {
        //
        // The name is assumed to be the same.
        //
-       public static ArrayList CopyNewMethods (ArrayList target_list, MemberInfo [] new_members)
+       public static ArrayList CopyNewMethods (ArrayList target_list, MemberList new_members)
        {
                if (target_list == null){
                        target_list = new ArrayList ();
@@ -1756,12 +2183,18 @@ public class TypeManager {
        //
        static Type     closure_invocation_type;
        static Type     closure_queried_type;
+       static Type     closure_qualifier_type;
 
        //
        // The assembly that defines the type is that is calling us
        //
        static Assembly closure_invocation_assembly;
 
+       static internal bool FilterNone (MemberInfo m, object filter_criteria)
+       {
+               return true;
+       }
+       
        //
        // This filter filters by name + whether it is ok to include private
        // members in the search
@@ -1773,9 +2206,13 @@ public class TypeManager {
                // fields. 
                //
 
-               if (m.Name != closure_name)
+               if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
                        return false;
 
+               if (((closure_qualifier_type == null) || (closure_qualifier_type == closure_invocation_type)) &&
+                   (m.DeclaringType == closure_invocation_type))
+                       return true;
+
                //
                // Ugly: we need to find out the type of `m', and depending
                // on this, tell whether we accept or not
@@ -1785,7 +2222,8 @@ public class TypeManager {
                        MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
 
                        if (ma == MethodAttributes.Private)
-                               return closure_private_ok;
+                               return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
+                                       IsNestedChildOf (closure_invocation_type, m.DeclaringType);
 
                        //
                        // FamAndAssem requires that we not only derivate, but we are on the
@@ -1807,8 +2245,22 @@ public class TypeManager {
                                return false;
 
                        // Family and FamANDAssem require that we derive.
-                       if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem))
-                               return IsSubclassOrNestedChildOf (closure_invocation_type, mb.DeclaringType);
+                       if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem)){
+                               if (closure_invocation_type == null)
+                                       return false;
+
+                               if (!IsSubclassOrNestedChildOf (closure_invocation_type, mb.DeclaringType))
+                                       return false;
+
+                               // Although a derived class can access protected members of its base class
+                               // it cannot do so through an instance of the base class (CS1540).
+                               if (!mb.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
+                                       return false;
+
+                               return true;
+                       }
 
                        // Public.
                        return true;
@@ -1819,7 +2271,8 @@ public class TypeManager {
                        FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
 
                        if (fa == FieldAttributes.Private)
-                               return closure_private_ok;
+                               return closure_private_ok || (closure_invocation_type == m.DeclaringType) ||
+                                       IsNestedChildOf (closure_invocation_type, m.DeclaringType);
 
                        //
                        // FamAndAssem requires that we not only derivate, but we are on the
@@ -1841,44 +2294,95 @@ public class TypeManager {
                                return false;
 
                        // Family and FamANDAssem require that we derive.
-                       if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem))
-                               return IsSubclassOrNestedChildOf (closure_invocation_type, fi.DeclaringType);
+                       if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem)){
+                               if (closure_invocation_type == null)
+                                       return false;
+
+                               if (!IsSubclassOrNestedChildOf (closure_invocation_type, fi.DeclaringType))
+                                       return false;
+
+                               // Although a derived class can access protected members of its base class
+                               // it cannot do so through an instance of the base class (CS1540).
+                               if (!fi.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
+                                       return false;
+
+                               return true;
+                       }
 
                        // Public.
                        return true;
                }
 
                //
-               // EventInfos and PropertyInfos, return true
+               // EventInfos and PropertyInfos, return true because they lack permission
+               // informaiton, so we need to check later on the methods.
                //
                return true;
        }
 
        static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
-       
+       static MemberFilter FilterNone_delegate = new MemberFilter (FilterNone);
+
        //
        // Looks up a member called `name' in the `queried_type'.  This lookup
-       // is done by code that is contained in the definition for `invocation_type'.
+       // is done by code that is contained in the definition for `invocation_type'
+       // through a qualifier of type `qualifier_type' (or null if there is no qualifier).
+       //
+       // `invocation_type' is used to check whether we're allowed to access the requested
+       // member wrt its protection level.
+       //
+       // When called from MemberAccess, `qualifier_type' is the type which is used to access
+       // the requested member (`class B { A a = new A (); a.foo = 5; }'; here invocation_type
+       // is B and qualifier_type is A).  This is used to do the CS1540 check.
+       //
+       // When resolving a SimpleName, `qualifier_type' is null.
+       //
+       // The `qualifier_type' is used for the CS1540 check; it's normally either null or
+       // the same than `queried_type' - except when we're being called from BaseAccess;
+       // in this case, `invocation_type' is the current type and `queried_type' the base
+       // type, so this'd normally trigger a CS1540.
        //
        // The binding flags are `bf' and the kind of members being looked up are `mt'
        //
+       // The return value always includes private members which code in `invocation_type'
+       // is allowed to access (using the specified `qualifier_type' if given); only use
+       // BindingFlags.NonPublic to bypass the permission check.
+       //
        // Returns an array of a single element for everything but Methods/Constructors
        // that might return multiple matches.
        //
-       public static MemberInfo [] MemberLookup (Type invocation_type, Type queried_type, 
-                                                 MemberTypes mt, BindingFlags original_bf, string name)
+       public static MemberInfo [] MemberLookup (Type invocation_type, Type qualifier_type,
+                                                 Type queried_type,  MemberTypes mt,
+                                                 BindingFlags original_bf, string name)
+       {
+               Timer.StartTimer (TimerType.MemberLookup);
+
+               MemberInfo[] retval = RealMemberLookup (invocation_type, qualifier_type,
+                                                       queried_type, mt, original_bf, name);
+
+               Timer.StopTimer (TimerType.MemberLookup);
+
+               return retval;
+       }
+
+       static MemberInfo [] RealMemberLookup (Type invocation_type, Type qualifier_type,
+                                              Type queried_type, MemberTypes mt,
+                                              BindingFlags original_bf, string name)
        {
                BindingFlags bf = original_bf;
                
                ArrayList method_list = null;
                Type current_type = queried_type;
                bool searching = (original_bf & BindingFlags.DeclaredOnly) == 0;
-               bool private_ok;
+               bool skip_iface_check = true, used_cache = false;
                bool always_ok_flag = false;
 
                closure_name = name;
                closure_invocation_type = invocation_type;
                closure_invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
+               closure_qualifier_type = qualifier_type;
 
                //
                // If we are a nested class, we always have access to our container
@@ -1889,7 +2393,7 @@ public class TypeManager {
                        if (invocation_name.IndexOf ('+') != -1){
                                string container = queried_type.FullName + "+";
                                int container_length = container.Length;
-                               
+
                                if (invocation_name.Length > container_length){
                                        string shared = invocation_name.Substring (0, container_length);
                                
@@ -1900,7 +2404,7 @@ public class TypeManager {
                }
                
                do {
-                       MemberInfo [] mi;
+                       MemberList list;
 
                        //
                        // `NonPublic' is lame, because it includes both protected and
@@ -1911,26 +2415,37 @@ public class TypeManager {
                        //    public, private and protected (internal does not come into the
                        //    equation)
                        //
-                       if (invocation_type != null){
-                               if (invocation_type == current_type){
-                                       private_ok = true;
-                               } else
-                                       private_ok = always_ok_flag;
-                               
-                               if (private_ok || invocation_type.IsSubclassOf (current_type))
-                                       bf = original_bf | BindingFlags.NonPublic;
-                       } else {
-                               private_ok = false;
-                               bf = original_bf & ~BindingFlags.NonPublic;
-                       }
+                       if ((invocation_type != null) &&
+                           ((invocation_type == current_type) ||
+                            IsNestedChildOf (invocation_type, current_type)) ||
+                           always_ok_flag)
+                               bf = original_bf | BindingFlags.NonPublic;
+                       else
+                               bf = original_bf;
 
-                       closure_private_ok = private_ok;
+                       closure_private_ok = (original_bf & BindingFlags.NonPublic) != 0;
                        closure_queried_type = current_type;
 
-                       mi = TypeManager.FindMembers (
-                               current_type, mt, bf | BindingFlags.DeclaredOnly,
-                               FilterWithClosure_delegate, name);
-                       
+                       Timer.StopTimer (TimerType.MemberLookup);
+
+                       list = MemberLookup_FindMembers (current_type, mt, bf, name, out used_cache);
+
+                       Timer.StartTimer (TimerType.MemberLookup);
+
+                       //
+                       // When queried for an interface type, the cache will automatically check all
+                       // inherited members, so we don't need to do this here.  However, this only
+                       // works if we already used the cache in the first iteration of this loop.
+                       //
+                       // If we used the cache in any further iteration, we can still terminate the
+                       // loop since the cache always looks in all parent classes.
+                       //
+
+                       if (used_cache)
+                               searching = false;
+                       else
+                               skip_iface_check = false;
+
                        if (current_type == TypeManager.object_type)
                                searching = false;
                        else {
@@ -1944,42 +2459,56 @@ public class TypeManager {
                                        current_type = TypeManager.object_type;
                        }
                        
-                       if (mi == null)
-                               continue;
-                       
-                       int count = mi.Length;
-                       
-                       if (count == 0)
+                       if (list.Count == 0)
                                continue;
-                       
+
                        //
                        // Events and types are returned by both `static' and `instance'
                        // searches, which means that our above FindMembers will
                        // return two copies of the same.
                        //
-                       if (count == 1 && !(mi [0] is MethodBase)){
-                               return mi;
+                       if (list.Count == 1 && !(list [0] is MethodBase)){
+                               return (MemberInfo []) list;
                        }
 
                        //
                        // Multiple properties: we query those just to find out the indexer
                        // name
                        //
-                       if (mi [0] is PropertyInfo)
-                               return mi;
+                       if (list [0] is PropertyInfo)
+                               return (MemberInfo []) list;
+
+                       //
+                       // We found an event: the cache lookup returns both the event and
+                       // its private field.
+                       //
+                       if (list [0] is EventInfo) {
+                               if ((list.Count == 2) && (list [1] is FieldInfo))
+                                       return new MemberInfo [] { list [0] };
+
+                               // Oooops
+                               return null;
+                       }
 
                        //
                        // We found methods, turn the search into "method scan"
                        // mode.
                        //
-                       
-                       method_list = CopyNewMethods (method_list, mi);
+
+                       method_list = CopyNewMethods (method_list, list);
                        mt &= (MemberTypes.Method | MemberTypes.Constructor);
                } while (searching);
 
                if (method_list != null && method_list.Count > 0)
                        return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
-       
+
+               //
+               // This happens if we already used the cache in the first iteration, in this case
+               // the cache already looked in all interfaces.
+               //
+               if (skip_iface_check)
+                       return null;
+
                //
                // Interfaces do not list members they inherit, so we have to
                // scan those.
@@ -1997,15 +2526,228 @@ public class TypeManager {
                foreach (Type itype in ifaces){
                        MemberInfo [] x;
 
-                       x = MemberLookup (null, itype, mt, bf, name);
+                       x = MemberLookup (null, null, itype, mt, bf, name);
                        if (x != null)
                                return x;
                }
                                        
                return null;
        }
+
+       //
+       // This is used to extract properties and event declarations from a type
+       //
+       static MemberInfo [] SpecialContainerLookup (Type t, bool is_static)
+       {
+               BindingFlags bf = BindingFlags.DeclaredOnly | (is_static ? BindingFlags.Static : BindingFlags.Instance);
+
+               bf |= BindingFlags.Public | BindingFlags.NonPublic;
+               
+               if (t is TypeBuilder) {
+                       DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+
+                       return (MemberInfo []) decl.FindMembers (
+                               MemberTypes.Property | MemberTypes.Event,
+                               bf, FilterNone_delegate, null);
+               } else {
+                       return t.FindMembers (MemberTypes.Property | MemberTypes.Event,
+                                             bf, FilterNone_delegate, null);
+
+               }
+       }
+       
+       public static bool IsSpecialMethod (MethodBase mb)
+       {
+               Type t = mb.DeclaringType;
+               
+               MemberInfo [] matches = TypeManager.SpecialContainerLookup (t, mb.IsStatic);
+               if (matches == null)
+                       return false;
+               
+               foreach (MemberInfo mi in matches){
+                       if (mi is PropertyBuilder){
+                               Pair p = (Pair) properties [mi];
+
+                               if (p.First == mb || p.Second == mb)
+                                       return true;
+                       } else if (mi is PropertyInfo){
+                               MethodInfo [] methods = ((PropertyInfo) mi).GetAccessors (true);
+                               
+                               foreach (MethodInfo m in methods){
+                                       if (m == mb)
+                                               return true;
+                               }
+                       } else if (mi is MyEventBuilder){
+                               Pair p = (Pair) events [mi];
+
+                               if (p.First == mb || p.Second == mb)
+                                       return true;
+                       } else if (mi is EventInfo){
+                               EventInfo ei = ((EventInfo) mi);
+                               
+                               if (ei.GetAddMethod (true) == mb)
+                                       return true;
+                               
+                               if (ei.GetRemoveMethod (true) == mb)
+                                       return true;
+                               
+                               if (ei.GetRaiseMethod (true) == mb)
+                                       return true;
+                       }
+               }
+
+               //
+               // Now check if it is an operator method
+               //
+               string s = mb.Name;
+
+               if (s.StartsWith ("op_")){
+                       foreach (string name in Unary.oper_names){
+                               if (s == name)
+                                       return true;
+                       }
+
+                       foreach (string name in Binary.oper_names){
+                               if (s == name)
+                                       return true;
+                       }
+               }
+               
+               return false;
+       }
+               
 #endregion
        
 }
 
+/// <summary>
+///   There is exactly one instance of this class per type.
+/// </summary>
+public sealed class TypeHandle : IMemberContainer {
+       public readonly TypeHandle BaseType;
+
+       readonly int id = ++next_id;
+       static int next_id = 0;
+
+       /// <summary>
+       ///   Lookup a TypeHandle instance for the given type.  If the type doesn't have
+       ///   a TypeHandle yet, a new instance of it is created.  This static method
+       ///   ensures that we'll only have one TypeHandle instance per type.
+       /// </summary>
+       public static TypeHandle GetTypeHandle (Type t)
+       {
+               TypeHandle handle = (TypeHandle) type_hash [t];
+               if (handle != null)
+                       return handle;
+
+               handle = new TypeHandle (t);
+               type_hash.Add (t, handle);
+               return handle;
+       }
+
+       /// <summary>
+       ///   Returns the TypeHandle for TypeManager.object_type.
+       /// </summary>
+       public static IMemberContainer ObjectType {
+               get {
+                       if (object_type != null)
+                               return object_type;
+
+                       object_type = GetTypeHandle (TypeManager.object_type);
+
+                       return object_type;
+               }
+       }
+
+       /// <summary>
+       ///   Returns the TypeHandle for TypeManager.array_type.
+       /// </summary>
+       public static IMemberContainer ArrayType {
+               get {
+                       if (array_type != null)
+                               return array_type;
+
+                       array_type = GetTypeHandle (TypeManager.array_type);
+
+                       return array_type;
+               }
+       }
+
+       private static PtrHashtable type_hash = new PtrHashtable ();
+
+       private static TypeHandle object_type = null;
+       private static TypeHandle array_type = null;
+
+       private Type type;
+       private bool is_interface;
+       private MemberCache member_cache;
+
+       private TypeHandle (Type type)
+       {
+               this.type = type;
+               if (type.BaseType != null)
+                       BaseType = GetTypeHandle (type.BaseType);
+               else if ((type != TypeManager.object_type) && (type != typeof (object)))
+                       is_interface = true;
+               this.member_cache = new MemberCache (this);
+       }
+
+       // IMemberContainer methods
+
+       public string Name {
+               get {
+                       return type.FullName;
+               }
+       }
+
+       public Type Type {
+               get {
+                       return type;
+               }
+       }
+
+       public IMemberContainer Parent {
+               get {
+                       return BaseType;
+               }
+       }
+
+       public bool IsInterface {
+               get {
+                       return is_interface;
+               }
+       }
+
+       public MemberList GetMembers (MemberTypes mt, BindingFlags bf)
+       {
+               if (mt == MemberTypes.Event)
+                       return new MemberList (type.GetEvents (bf | BindingFlags.DeclaredOnly));
+               else
+                       return new MemberList (type.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
+                                                                null, null));
+       }
+
+       // IMemberFinder methods
+
+       public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
+                                      MemberFilter filter, object criteria)
+       {
+               return member_cache.FindMembers (mt, bf, name, filter, criteria);
+       }
+
+       public MemberCache MemberCache {
+               get {
+                       return member_cache;
+               }
+       }
+
+       public override string ToString ()
+       {
+               if (BaseType != null)
+                       return "TypeHandle (" + id + "," + Name + " : " + BaseType + ")";
+               else
+                       return "TypeHandle (" + id + "," + Name + ")";
+       }
+}
+
 }