Small bug fix, to render better an acurrate error
[mono.git] / mcs / mcs / typemanager.cs
index 4118460bc9d7903c72d902e97b9df4641823bfda..58f9a0168cc7ed2386ff67a511741714f536acbd 100755 (executable)
 // (C) 2001 Ximian, Inc (http://www.ximian.com)
 //
 //
-#undef BROKEN_RUNTIME
+
+//
+// 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;
 
 namespace Mono.CSharp {
 
-public class MemberList : IList {
-       public readonly IList List;
-       int count;
-
-       public MemberList (IList list)
-       {
-               if (list != null)
-                       this.List = list;
-               else
-                       this.List = new ArrayList ();
-               count = List.Count;
-       }
-
-       public static readonly MemberList Empty = new MemberList (new ArrayList ());
-
-       public static explicit operator MemberInfo [] (MemberList list)
-       {
-               Timer.StartTimer (TimerType.MiscTimer);
-               MemberInfo [] result = new MemberInfo [list.Count];
-               list.CopyTo (result, 0);
-               Timer.StopTimer (TimerType.MiscTimer);
-               return result;
-       }
-
-       // ICollection
-
-       public int Count {
-               get {
-                       return count;
-               }
-       }
-
-       public bool IsSynchronized {
-               get {
-                       return List.IsSynchronized;
-               }
-       }
-
-       public object SyncRoot {
-               get {
-                       return List.SyncRoot;
-               }
-       }
-
-       public void CopyTo (Array array, int index)
-       {
-               List.CopyTo (array, index);
-       }
-
-       // IEnumerable
-
-       public IEnumerator GetEnumerator ()
-       {
-               return List.GetEnumerator ();
-       }
-
-       // IList
-
-       public bool IsFixedSize {
-               get {
-                       return true;
-               }
-       }
-
-       public bool IsReadOnly {
-               get {
-                       return true;
-               }
-       }
-
-       object IList.this [int index] {
-               get {
-                       return List [index];
-               }
-
-               set {
-                       throw new NotSupportedException ();
-               }
-       }
-
-       public MemberInfo this [int index] {
-               get {
-                       return (MemberInfo) List [index];
-               }
-       }
-
-       public int Add (object value)
-       {
-               throw new NotSupportedException ();
-       }
-
-       public void Clear ()
-       {
-               throw new NotSupportedException ();
-       }
-
-       public bool Contains (object value)
-       {
-               return List.Contains (value);
-       }
-
-       public int IndexOf (object value)
-       {
-               return List.IndexOf (value);
-       }
-
-       public void Insert (int index, object value)
-       {
-               throw new NotSupportedException ();
-       }
-
-       public void Remove (object value)
-       {
-               throw new NotSupportedException ();
-       }
-
-       public void RemoveAt (int index)
-       {
-               throw new NotSupportedException ();
-       }
-}
-
-public interface IMemberFinder {
-       MemberList FindMembers (MemberTypes mt, BindingFlags bf,
-                               MemberFilter filter, object criteria);
-}
-
-public interface ICachingMemberFinder : IMemberFinder {
-       MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
-                               MemberFilter filter, object criteria);
-}
-
-public interface IMemberContainer : ICachingMemberFinder {
-       string Name {
-               get;
-       }
-
-       Type Type {
-               get;
-       }
-
-       IMemberContainer Parent {
-               get;
-       }
-
-       bool IsInterface {
-               get;
-       }
-
-       MemberList GetMembers (MemberTypes mt, BindingFlags bf);
-}
-
 public class TypeManager {
        //
        // A list of core types that the compiler requires or uses
@@ -205,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;
@@ -219,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
@@ -272,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;
@@ -296,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
@@ -331,7 +197,7 @@ public class TypeManager {
        // </remarks>
        static ArrayList user_types;
 
-       static PtrHashtable builder_to_member_finder;
+       static PtrHashtable builder_to_declspace;
 
        // <remarks>
        //   Tracks the interfaces implemented by typebuilders.  We only
@@ -452,7 +318,7 @@ public class TypeManager {
                types = new Hashtable ();
                typecontainers = new Hashtable ();
                
-               builder_to_member_finder = new PtrHashtable ();
+               builder_to_declspace = new PtrHashtable ();
                builder_to_attr = new PtrHashtable ();
                builder_to_method = new PtrHashtable ();
                method_arguments = new PtrHashtable ();
@@ -472,7 +338,7 @@ public class TypeManager {
                        types.Add (name, t);
                } catch {
                        Type prev = (Type) types [name];
-                       TypeContainer tc = builder_to_member_finder [prev] as TypeContainer;
+                       TypeContainer tc = builder_to_declspace [prev] as TypeContainer;
 
                        if (tc != null){
                                //
@@ -482,7 +348,7 @@ public class TypeManager {
                                return;
                        }
 
-                       tc = builder_to_member_finder [t] as TypeContainer;
+                       tc = builder_to_declspace [t] as TypeContainer;
                        
                        Report.Warning (
                                1595, "The type `" + name + "' is defined in an existing assembly;"+
@@ -509,7 +375,7 @@ public class TypeManager {
        
        public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
        {
-               builder_to_member_finder.Add (t, tc);
+               builder_to_declspace.Add (t, tc);
                typecontainers.Add (name, tc);
                AddUserType (name, t, ifaces);
        }
@@ -517,19 +383,19 @@ public class TypeManager {
        public static void AddDelegateType (string name, TypeBuilder t, Delegate del)
        {
                types.Add (name, t);
-               builder_to_member_finder.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_member_finder.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_member_finder.Add (t, i);
+               builder_to_declspace.Add (t, i);
        }
 
        public static void AddMethod (MethodBuilder builder, MethodData method)
@@ -548,22 +414,33 @@ public class TypeManager {
        /// </summary>
        public static TypeContainer LookupTypeContainer (Type t)
        {
-               return builder_to_member_finder [t] as TypeContainer;
+               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 builder_to_member_finder [t] as Interface;
+               return builder_to_declspace [t] as Interface;
        }
 
        public static Delegate LookupDelegate (Type t)
        {
-               return builder_to_member_finder [t] as Delegate;
+               return builder_to_declspace [t] as Delegate;
        }
 
        public static Enum LookupEnum (Type t)
        {
-               return builder_to_member_finder [t] as Enum;
+               return builder_to_declspace [t] as Enum;
        }
        
        public static TypeContainer LookupAttr (Type t)
@@ -599,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)
        {
@@ -614,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>
@@ -641,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)", 
@@ -698,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");
@@ -812,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");
@@ -821,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");
 
@@ -831,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
@@ -869,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");
                        }
                }
        }
@@ -897,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 (
@@ -925,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 (
@@ -933,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
                //
@@ -989,105 +1158,50 @@ public class TypeManager {
 
                unverifiable_code_ctor = GetConstructor (
                        unverifiable_code_type, void_arg);
-               
-       }
-
-       const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
-
-       static Hashtable type_hash = new Hashtable ();
-
-       public static MemberList FindMembers (Type t, MemberTypes mt, BindingFlags bf,
-                                             MemberFilter filter, object criteria)
-       {
-               IMemberFinder finder = (IMemberFinder) builder_to_member_finder [t];
-               ICachingMemberFinder caching_finder = finder as ICachingMemberFinder;
-
-               if (finder != null) {
-                       if ((caching_finder == null) || (filter != FilterWithClosure_delegate)) {
-                               MemberList list;
-                               Timer.StartTimer (TimerType.FindMembers);
-                               list = finder.FindMembers (mt, bf, filter, criteria);
-                               Timer.StopTimer (TimerType.FindMembers);
-                               return list;
-                       }
-
-                       return caching_finder.FindMembers (mt, bf, (string) criteria, filter, null);
-               }
 
                //
-               // 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.
+               // InvalidOperationException
                //
+               invalid_operation_ctor = GetConstructor (
+                       invalid_operation_exception_type, void_arg);
 
-               if (t.IsSubclassOf (TypeManager.array_type))
-                       return new MemberList (TypeManager.array_type.FindMembers (mt, bf, filter, criteria));
 
-               if (filter != FilterWithClosure_delegate)
-                       return new MemberList (RealFindMembers (t, mt, bf, filter, criteria));
+               // Object
+               object_ctor = GetConstructor (object_type, void_arg);
 
-               caching_finder = TypeHandle.GetTypeHandle (t);
-               builder_to_member_finder.Add (t, caching_finder);
-
-               return caching_finder.FindMembers (mt, bf, (string) criteria, filter, null);
        }
 
+       const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
 
-       /// FIXME FIXME FIXME
-       ///   This method is a big hack until the new MemberCache is finished, it will be gone in
-       ///   a few days.
-       /// FIXME FIXME FIXME
+       static Hashtable type_hash = new Hashtable ();
 
-       private static MemberList MemberLookup_FindMembers (Type t, MemberTypes mt, BindingFlags bf,
-                                                           string name, ref bool searching)
+       /// <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];
+
                //
-               // 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.
+               // `builder_to_declspace' contains all dynamic types.
                //
-
-               if (t.IsSubclassOf (TypeManager.array_type)) {
-                       searching = false;
-                       return TypeHandle.ArrayType.FindMembers (
-                               mt, bf, name, FilterWithClosure_delegate, null);
-               // return new MemberList (TypeManager.array_type.FindMembers (
-               //              mt, bf | BindingFlags.DeclaredOnly, FilterWithClosure_delegate, name));
-               }
-
-               IMemberFinder finder = (IMemberFinder) builder_to_member_finder [t];
-               ICachingMemberFinder caching_finder = finder as ICachingMemberFinder;
-
-               if (caching_finder != null) {
-                       searching = false;
-                       return caching_finder.FindMembers (
-                               mt, bf, name, FilterWithClosure_delegate, null);
-               }
-
-               if (finder != null) {
+               if (decl != null) {
                        MemberList list;
                        Timer.StartTimer (TimerType.FindMembers);
-                       list = finder.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
-                                                  FilterWithClosure_delegate, name);
+                       list = decl.FindMembers (mt, bf, filter, criteria);
                        Timer.StopTimer (TimerType.FindMembers);
                        return list;
                }
 
-               caching_finder = TypeHandle.GetTypeHandle (t);
-               builder_to_member_finder.Add (t, caching_finder);
-
-               searching = false;
-               return caching_finder.FindMembers (mt, bf, name, FilterWithClosure_delegate, null);
-       }
-
-       //
-       // FIXME: This can be optimized easily.  speedup by having a single builder mapping
-       //
-       static MemberInfo [] RealFindMembers (Type t, MemberTypes mt, BindingFlags bf,
-                                             MemberFilter filter, object criteria)
-       {
-               if (t is TypeBuilder)
-                       return null;
+               //
+               // 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 new MemberList (TypeManager.array_type.FindMembers (mt, bf, filter, criteria));
 
                //
                // Since FindMembers will not lookup both static and instance
@@ -1105,28 +1219,86 @@ public class TypeManager {
                                // 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 (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 || s_len > 0)
+                               return new MemberList (i_members, s_members);
+                       else {
                                if (i_len > 0)
-                                       return i_members;
+                                       return new MemberList (i_members);
                                else
-                                       return s_members;
+                                       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)
+       {
+               //
+               // 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 == TypeManager.array_type || t.IsSubclassOf (TypeManager.array_type)) {
+                       used_cache = true;
+                       return TypeHandle.ArrayType.MemberCache.FindMembers (
+                               mt, bf, name, FilterWithClosure_delegate, null);
+               }
+
+               //
+               // 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 (cache != null) {
+                               used_cache = true;
+                               return cache.FindMembers (
+                                       mt, bf, name, FilterWithClosure_delegate, null);
+                       }
+
+                       // If there is no MemberCache, we need to use the "normal" FindMembers.
+
+                       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;
+               }
+
+               //
+               // 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);
+
+               used_cache = true;
+               return handle.MemberCache.FindMembers (mt, bf, name, FilterWithClosure_delegate, null);
        }
 
        public static bool IsBuiltinType (Type t)
@@ -1140,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))
@@ -1150,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;
@@ -1166,7 +1393,7 @@ public class TypeManager {
        
        public static bool IsInterfaceType (Type t)
        {
-               Interface iface = builder_to_member_finder [t] as Interface;
+               Interface iface = builder_to_declspace [t] as Interface;
 
                if (iface != null)
                        return true;
@@ -1190,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>
@@ -1205,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)
@@ -1380,7 +1658,7 @@ public class TypeManager {
 
                        return (MethodInfo) pair.Second;
                } else
-                       return ei.GetAddMethod ();
+                       return ei.GetRemoveMethod ();
        }
 
        static Hashtable priv_fields_events;
@@ -1428,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.  
@@ -1581,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;
@@ -1596,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)))
@@ -1629,7 +1859,8 @@ public class TypeManager {
                else if (conversionType.Equals (typeof (Object)))
                        return (object)(value);
                else 
-                       throw new InvalidCastException ();
+                       error = true;
+               return null;
        }
 
        //
@@ -1952,13 +2183,18 @@ public class TypeManager {
        //
        static Type     closure_invocation_type;
        static Type     closure_queried_type;
-       static Type     closure_start_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
@@ -1971,9 +2207,10 @@ public class TypeManager {
                //
 
                if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
-                               return false;
+                       return false;
 
-               if (closure_start_type == closure_invocation_type)
+               if (((closure_qualifier_type == null) || (closure_qualifier_type == closure_invocation_type)) &&
+                   (m.DeclaringType == closure_invocation_type))
                        return true;
 
                //
@@ -1985,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
@@ -2016,8 +2254,9 @@ public class TypeManager {
 
                                // 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 ((closure_invocation_type != closure_start_type) &&
-                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                               if (!mb.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
                                        return false;
 
                                return true;
@@ -2032,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
@@ -2063,8 +2303,9 @@ public class TypeManager {
 
                                // 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 ((closure_invocation_type != closure_start_type) &&
-                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                               if (!fi.IsStatic && (closure_invocation_type != closure_qualifier_type) &&
+                                   (closure_qualifier_type != null) &&
+                                   closure_invocation_type.IsSubclassOf (closure_qualifier_type))
                                        return false;
 
                                return true;
@@ -2075,50 +2316,73 @@ public class TypeManager {
                }
 
                //
-               // 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, queried_type,
-                                                       mt, original_bf, name);
+               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 queried_type, 
-                                              MemberTypes mt, BindingFlags original_bf, string name)
+       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_start_type = queried_type;
+               closure_qualifier_type = qualifier_type;
 
                //
                // If we are a nested class, we always have access to our container
@@ -2129,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);
                                
@@ -2151,28 +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;
 
                        Timer.StopTimer (TimerType.MemberLookup);
 
-                       list = MemberLookup_FindMembers (current_type, mt, bf, name, ref searching);
+                       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 {
@@ -2188,7 +2461,7 @@ public class TypeManager {
                        
                        if (list.Count == 0)
                                continue;
-                       
+
                        //
                        // Events and types are returned by both `static' and `instance'
                        // searches, which means that our above FindMembers will
@@ -2205,18 +2478,37 @@ public class TypeManager {
                        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, 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.
@@ -2234,276 +2526,108 @@ 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;
        }
-#endregion
-       
-}
 
-public class MemberCache {
-       public readonly IMemberContainer Container;
-       protected Hashtable MemberHash;
-
-       public MemberCache (IMemberContainer container)
+       //
+       // This is used to extract properties and event declarations from a type
+       //
+       static MemberInfo [] SpecialContainerLookup (Type t, bool is_static)
        {
-               this.Container = container;
-               this.MemberHash = new Hashtable ();
-
-               Timer.IncrementCounter (CounterType.MemberCache);
-               Timer.StartTimer (TimerType.CacheInit);
+               BindingFlags bf = BindingFlags.DeclaredOnly | (is_static ? BindingFlags.Static : BindingFlags.Instance);
 
-#if BROKEN_RUNTIME
-               IMemberContainer current = Container;
-               do {
-                       AddMembers (current);
-                       current = current.Parent;
-               } while (current != null);
-#else
-               AddMembers (Container);
-               if (Container.IsInterface)
-                       AddMembers (TypeHandle.ObjectType);
-#endif
-
-               Timer.StopTimer (TimerType.CacheInit);
-       }
+               bf |= BindingFlags.Public | BindingFlags.NonPublic;
+               
+               if (t is TypeBuilder) {
+                       DeclSpace decl = (DeclSpace) builder_to_declspace [t];
 
-       void AddMembers (IMemberContainer container)
-       {
-               AddMembers (MemberTypes.Constructor, container);
-               AddMembers (MemberTypes.Event, container);
-               AddMembers (MemberTypes.Field, container);
-               AddMembers (MemberTypes.Method, container);
-               AddMembers (MemberTypes.Property, container);
-               AddMembers (MemberTypes.NestedType, container);
-       }
+                       return (MemberInfo []) decl.FindMembers (
+                               MemberTypes.Property | MemberTypes.Event,
+                               bf, FilterNone_delegate, null);
+               } else {
+                       return t.FindMembers (MemberTypes.Property | MemberTypes.Event,
+                                             bf, FilterNone_delegate, null);
 
-       void AddMembers (MemberTypes mt, IMemberContainer container)
-       {
-               AddMembers (mt, BindingFlags.Static | BindingFlags.Public, container);
-               AddMembers (mt, BindingFlags.Static | BindingFlags.NonPublic, container);
-               AddMembers (mt, BindingFlags.Instance | BindingFlags.Public, container);
-               AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, container);
+               }
        }
-
-       void AddMembers (MemberTypes mt, BindingFlags bf, IMemberContainer container)
+       
+       public static bool IsSpecialMethod (MethodBase mb)
        {
-               MemberList members = container.GetMembers (mt, bf);
-               BindingFlags new_bf = (container == Container) ? bf | BindingFlags.DeclaredOnly : bf;
+               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];
 
-               foreach (MemberInfo member in members) {
-                       string name = member.Name;
+                               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];
 
-                       ArrayList list = (ArrayList) MemberHash [name];
-                       if (list == null) {
-                               list = new ArrayList ();
-                               MemberHash.Add (name, list);
+                               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;
                        }
-
-#if !BROKEN_RUNTIME
-                       new_bf = (member.DeclaringType == container.Type) ?
-                               bf | BindingFlags.DeclaredOnly : bf;
-#endif
-
-                       list.Add (new CacheEntry (container, member, mt, new_bf));
-               }
-       }
-
-       protected static EntryType GetEntryType (MemberTypes mt, BindingFlags bf)
-       {
-               EntryType type = EntryType.None;
-
-               if ((mt & MemberTypes.Constructor) != 0)
-                       type |= EntryType.Constructor;
-               if ((mt & MemberTypes.Event) != 0)
-                       type |= EntryType.Event;
-               if ((mt & MemberTypes.Field) != 0)
-                       type |= EntryType.Field;
-               if ((mt & MemberTypes.Method) != 0)
-                       type |= EntryType.Method;
-               if ((mt & MemberTypes.Property) != 0)
-                       type |= EntryType.Property;
-               if ((mt & MemberTypes.NestedType) != 0)
-                       type |= EntryType.NestedType;
-
-               if ((bf & BindingFlags.Instance) != 0)
-                       type |= EntryType.Instance;
-               if ((bf & BindingFlags.Static) != 0)
-                       type |= EntryType.Static;
-               if ((bf & BindingFlags.Public) != 0)
-                       type |= EntryType.Public;
-               if ((bf & BindingFlags.NonPublic) != 0)
-                       type |= EntryType.NonPublic;
-               if ((bf & BindingFlags.DeclaredOnly) != 0)
-                       type |= EntryType.Declared;
-
-               return type;
-       }
-
-       public static bool IsSingleMemberType (MemberTypes mt)
-       {
-               switch (mt) {
-               case MemberTypes.Constructor:
-               case MemberTypes.Event:
-               case MemberTypes.Field:
-               case MemberTypes.Method:
-               case MemberTypes.Property:
-               case MemberTypes.NestedType:
-                       return true;
-
-               default:
-                       return false;
-               }
-       }
-
-       [Flags]
-       protected enum EntryType {
-               None            = 0x000,
-
-               Instance        = 0x001,
-               Static          = 0x002,
-               MaskStatic      = Instance|Static,
-
-               Public          = 0x004,
-               NonPublic       = 0x008,
-               MaskProtection  = Public|NonPublic,
-
-               Declared        = 0x010,
-
-               Constructor     = 0x020,
-               Event           = 0x040,
-               Field           = 0x080,
-               Method          = 0x100,
-               Property        = 0x200,
-               NestedType      = 0x400,
-
-               MaskType        = Constructor|Event|Field|Method|Property|NestedType
-       }
-
-       protected struct CacheEntry {
-#if BROKEN_RUNTIME
-               // FIXME: This field is a temporary hack until the Mono runtime is fixed
-               //        and distinguishes between ReflectedType and DeclaringType.
-               public readonly IMemberContainer Container;
-#endif
-               public readonly EntryType EntryType;
-               public readonly MemberInfo Member;
-
-               public CacheEntry (IMemberContainer container, MemberInfo member, MemberTypes mt,
-                                  BindingFlags bf)
-               {
-#if BROKEN_RUNTIME
-                       this.Container = container;
-#endif
-                       this.Member = member;
-                       this.EntryType = GetEntryType (mt, bf);
                }
-       }
 
-       protected void SearchMembers (ArrayList list, MemberTypes mt, BindingFlags bf, IList applicable,
-                                     MemberFilter filter, object criteria)
-       {
-               bool declared_only = (bf & BindingFlags.DeclaredOnly) != 0;
-               EntryType type = GetEntryType (mt, bf);
-
-               IMemberContainer current = Container;
-
-               foreach (CacheEntry entry in applicable) {
-#if BROKEN_RUNTIME
-                       if (entry.Container != current) {
-                               current = entry.Container;
-
-                               // We've reached a base class while doing a DeclaredOnly search.
-                               if (declared_only)
-                                       break;
-
-                               //
-                               // 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 (list.Count == 1 && !(list [0] is MethodBase))
-                                       break;
+               //
+               // Now check if it is an operator method
+               //
+               string s = mb.Name;
 
-                               //
-                               // Multiple properties: we query those just to find out the indexer
-                               // name
-                               //
-                               if ((list.Count > 0) && (list [0] is PropertyInfo))
-                                       break;
+               if (s.StartsWith ("op_")){
+                       foreach (string name in Unary.oper_names){
+                               if (s == name)
+                                       return true;
                        }
-#else
-                       if (declared_only && (entry.Member.DeclaringType != Container.Type))
-                               break;
-#endif
-
-                       if ((entry.EntryType & type & EntryType.MaskType) == 0)
-                               continue;
-
-                       if ((entry.EntryType & type & EntryType.MaskStatic) == 0)
-                               continue;
-
-                       if (filter (entry.Member, criteria)) {
-                               list.Add (entry.Member);
-#if !BROKEN_RUNTIME
-                               //
-                               // 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 (list.Count == 1 && !(list [0] is MethodBase))
-                                       break;
 
-                               //
-                               // Multiple properties: we query those just to find out the indexer
-                               // name
-                               //
-                               if ((list.Count > 0) && (list [0] is PropertyInfo))
-                                       break;
-#endif
+                       foreach (string name in Binary.oper_names){
+                               if (s == name)
+                                       return true;
                        }
                }
+               
+               return false;
        }
-
-       public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
-                                      MemberFilter filter, object criteria)
-       {
-               IList applicable = (IList) MemberHash [name];
-               if (applicable == null)
-                       return MemberList.Empty;
-
-               ArrayList list = new ArrayList ();
-
-               if ((bf & BindingFlags.Static) != 0) {
-                       SearchMembers (list, mt, bf & ~BindingFlags.Instance, applicable,
-                                      filter, criteria);
-
-                       if (list.Count == 1){
-                               MemberInfo one = (MemberInfo) list [0];
-
-                               //
-                               // If any of these are present, we are done!
-                               //
-                               if ((one is Type) || (one is EventInfo) || (one is FieldInfo))
-                                       return new MemberList (list);
-                       }
-               }                               
-
-               if ((bf & BindingFlags.Instance) != 0)
-                       SearchMembers (list, mt, bf & ~BindingFlags.Static, applicable,
-                                      filter, criteria);
-
-               return new MemberList (list);
-       }
+               
+#endregion
+       
 }
 
+/// <summary>
+///   There is exactly one instance of this class per type.
+/// </summary>
 public sealed class TypeHandle : IMemberContainer {
        public readonly TypeHandle BaseType;
-       public readonly MemberCache MemberCache;
+
+       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
@@ -2529,7 +2653,7 @@ public sealed class TypeHandle : IMemberContainer {
                        if (object_type != null)
                                return object_type;
 
-                       Initialize ();
+                       object_type = GetTypeHandle (TypeManager.object_type);
 
                        return object_type;
                }
@@ -2543,22 +2667,12 @@ public sealed class TypeHandle : IMemberContainer {
                        if (array_type != null)
                                return array_type;
 
-                       Initialize ();
+                       array_type = GetTypeHandle (TypeManager.array_type);
 
                        return array_type;
                }
        }
 
-       // This must be called after the core types have been created.
-       private static void Initialize ()
-       {
-               if (object_type == null)
-                       object_type = GetTypeHandle (TypeManager.object_type);
-
-               if (array_type == null)
-                       array_type = GetTypeHandle (TypeManager.array_type);
-       }
-
        private static PtrHashtable type_hash = new PtrHashtable ();
 
        private static TypeHandle object_type = null;
@@ -2566,28 +2680,23 @@ public sealed class TypeHandle : IMemberContainer {
 
        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) {
-                       //
-                       // This happens with interfaces, they have a null
-                       // basetype.  Look members up in the Object class.
-                       //
-                       BaseType = object_type;
+               else if ((type != TypeManager.object_type) && (type != typeof (object)))
                        is_interface = true;
-               }
-               this.MemberCache = new MemberCache (this);
+               this.member_cache = new MemberCache (this);
        }
 
        // IMemberContainer methods
 
        public string Name {
                get {
-                       return Type.FullName;
+                       return type.FullName;
                }
        }
 
@@ -2611,32 +2720,33 @@ public sealed class TypeHandle : IMemberContainer {
 
        public MemberList GetMembers (MemberTypes mt, BindingFlags bf)
        {
-#if BROKEN_RUNTIME
-               return new MemberList (Type.FindMembers (
-                       mt, bf | BindingFlags.DeclaredOnly, null, null));
-#else
-               return new MemberList (Type.FindMembers (mt, bf, null, null));
-#endif
+               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,
-                                      MemberFilter filter, object criteria)
-       {
-               throw new NotSupportedException ();
-       }
-
        public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
                                       MemberFilter filter, object criteria)
        {
-               MemberList list;
+               return member_cache.FindMembers (mt, bf, name, filter, criteria);
+       }
 
-               Timer.StartTimer (TimerType.CachedLookup);
-               list = MemberCache.FindMembers (mt, bf, name, filter, criteria);
-               Timer.StopTimer (TimerType.CachedLookup);
+       public MemberCache MemberCache {
+               get {
+                       return member_cache;
+               }
+       }
 
-               return list;
+       public override string ToString ()
+       {
+               if (BaseType != null)
+                       return "TypeHandle (" + id + "," + Name + " : " + BaseType + ")";
+               else
+                       return "TypeHandle (" + id + "," + Name + ")";
        }
 }