2002-08-13 Martin Baulig <martin@gnome.org>
[mono.git] / mcs / mcs / typemanager.cs
index dc50afcf4007cda7f04852119f30c9eecf0486c8..0080b286c12549c13399ab721151509ad2e69773 100755 (executable)
 // typemanager.cs: C# type manager
 //
 // Author: Miguel de Icaza (miguel@gnu.org)
+//         Ravi Pratap     (ravi@ximian.com)
 //
 // Licensed under the terms of the GNU GPL
 //
 // (C) 2001 Ximian, Inc (http://www.ximian.com)
 //
 //
+#define CACHE
 
 using System;
+using System.Globalization;
 using System.Collections;
 using System.Reflection;
 using System.Reflection.Emit;
+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 false;
+               }
+       }
+
+       public object SyncRoot {
+               get {
+                       throw new NotSupportedException ();
+               }
+       }
+
+       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 ();
+               }
+       }
+
+       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 {
+       MemberList GetMembers (MemberTypes mt, BindingFlags bf, bool declared);
+}
+
 public class TypeManager {
        //
        // A list of core types that the compiler requires or uses
@@ -30,6 +172,7 @@ public class TypeManager {
        static public Type float_type;
        static public Type double_type;
        static public Type char_type;
+       static public Type char_ptr_type;
        static public Type short_type;
        static public Type decimal_type;
        static public Type bool_type;
@@ -53,15 +196,61 @@ public class TypeManager {
        static public Type intptr_type;
        static public Type monitor_type;
        static public Type runtime_field_handle_type;
+       static public Type attribute_type;
        static public Type attribute_usage_type;
        static public Type dllimport_type;
+       static public Type unverifiable_code_type;
        static public Type methodimpl_attr_type;
+       static public Type marshal_as_attr_type;
        static public Type param_array_type;
+       static public Type void_ptr_type;
+       static public Type indexer_name_type;
+       static public Type exception_type;
+       static public object obsolete_attribute_type;
+       static public object conditional_attribute_type;
+
+       //
+       // An empty array of types
+       //
+       static public Type [] NoTypes;
+
+
+       // 
+       // Expressions representing the internal types.  Used during declaration
+       // definition.
+       //
+       static public Expression system_object_expr, system_string_expr; 
+       static public Expression system_boolean_expr, system_decimal_expr;
+       static public Expression system_single_expr, system_double_expr;
+       static public Expression system_sbyte_expr, system_byte_expr;
+       static public Expression system_int16_expr, system_uint16_expr;
+       static public Expression system_int32_expr, system_uint32_expr;
+       static public Expression system_int64_expr, system_uint64_expr;
+       static public Expression system_char_expr, system_void_expr;
+       static public Expression system_asynccallback_expr;
+       static public Expression system_iasyncresult_expr;
+
+       //
+       // This is only used when compiling corlib
+       //
+       static public Type system_int32_type;
+       static public Type system_array_type;
+       static public Type system_type_type;
+       static public Type system_assemblybuilder_type;
+       static public MethodInfo system_int_array_get_length;
+       static public MethodInfo system_int_array_get_rank;
+       static public MethodInfo system_object_array_clone;
+       static public MethodInfo system_int_array_get_length_int;
+       static public MethodInfo system_int_array_get_lower_bound_int;
+       static public MethodInfo system_int_array_get_upper_bound_int;
+       static public MethodInfo system_void_array_copyto_array_int;
+       static public MethodInfo system_void_set_corlib_type_builders;
+
        
        //
        // Internal, not really used outside
        //
-       Type runtime_helpers_type;
+       static Type runtime_helpers_type;
        
        //
        // These methods are called by code generated by the compiler
@@ -79,47 +268,60 @@ public class TypeManager {
        static public MethodInfo int_getlength_int;
        static public MethodInfo delegate_combine_delegate_delegate;
        static public MethodInfo delegate_remove_delegate_delegate;
+       static public MethodInfo int_get_offset_to_string_data;
+       static public MethodInfo int_array_get_length;
+       static public MethodInfo int_array_get_rank;
+       static public MethodInfo object_array_clone;
+       static public MethodInfo int_array_get_length_int;
+       static public MethodInfo int_array_get_lower_bound_int;
+       static public MethodInfo int_array_get_upper_bound_int;
+       static public MethodInfo void_array_copyto_array_int;
        
        //
        // The attribute constructors.
        //
        static public ConstructorInfo cons_param_array_attribute;
+       static public ConstructorInfo void_decimal_ctor_five_args;
+       static public ConstructorInfo unverifiable_code_ctor;
        
        // <remarks>
        //   Holds the Array of Assemblies that have been loaded
        //   (either because it is the default or the user used the
        //   -r command line option)
        // </remarks>
-       ArrayList assemblies;
+       static Assembly [] assemblies;
 
        // <remarks>
        //  Keeps a list of module builders. We used this to do lookups
        //  on the modulebuilder using GetType -- needed for arrays
        // </remarks>
-       ArrayList modules;
+       static ModuleBuilder [] modules;
 
        // <remarks>
        //   This is the type_cache from the assemblies to avoid
        //   hitting System.Reflection on every lookup.
        // </summary>
-       Hashtable types;
+       static Hashtable types;
 
        // <remarks>
        //  This is used to hotld the corresponding TypeContainer objects
        //  since we need this in FindMembers
        // </remarks>
-       Hashtable typecontainers;
+       static Hashtable typecontainers;
 
        // <remarks>
        //   Keeps track of those types that are defined by the
        //   user's program
        // </remarks>
-       ArrayList user_types;
+       static ArrayList user_types;
+
+       static PtrHashtable builder_to_member_finder;
 
        // <remarks>
-       //   Keeps a mapping between TypeBuilders and their TypeContainers
+       //   Tracks the interfaces implemented by typebuilders.  We only
+       //   enter those who do implement or or more interfaces
        // </remarks>
-       static PtrHashtable builder_to_container;
+       static PtrHashtable builder_to_ifaces;
 
        // <remarks>
        //   Maps MethodBase.RuntimeTypeHandle to a Type array that contains
@@ -127,111 +329,225 @@ public class TypeManager {
        // </remarks>
        static Hashtable method_arguments;
 
+       // <remarks>
+       //   Maps PropertyBuilder to a Type array that contains
+       //   the arguments to the indexer
+       // </remarks>
+       static Hashtable indexer_arguments;
+
        // <remarks>
        //   Maybe `method_arguments' should be replaced and only
        //   method_internal_params should be kept?
        // <remarks>
        static Hashtable method_internal_params;
 
-       static PtrHashtable builder_to_interface;
-
        // <remarks>
-       //  Keeps track of delegate types
+       //  Keeps track of attribute types
        // </remarks>
 
-       static Hashtable builder_to_delegate;
+       static Hashtable builder_to_attr;
 
        // <remarks>
-       //  Keeps track of enum types
+       //  Keeps track of methods
        // </remarks>
 
-       static Hashtable builder_to_enum;
+       static Hashtable builder_to_method;
 
-       // <remarks>
-       //  Keeps track of attribute types
-       // </remarks>
+       struct Signature {
+               public string name;
+               public Type [] args;
+       }
 
-       static Hashtable builder_to_attr;
+       /// <summary>
+       ///   A filter for Findmembers that uses the Signature object to
+       ///   extract objects
+       /// </summary>
+       static bool SignatureFilter (MemberInfo mi, object criteria)
+       {
+               Signature sig = (Signature) criteria;
+
+               if (!(mi is MethodBase))
+                       return false;
+               
+               if (mi.Name != sig.name)
+                       return false;
+
+               int count = sig.args.Length;
+               
+               if (mi is MethodBuilder || mi is ConstructorBuilder){
+                       Type [] candidate_args = GetArgumentTypes ((MethodBase) mi);
+
+                       if (candidate_args.Length != count)
+                               return false;
+                       
+                       for (int i = 0; i < count; i++)
+                               if (candidate_args [i] != sig.args [i])
+                                       return false;
+                       
+                       return true;
+               } else {
+                       ParameterInfo [] pars = ((MethodBase) mi).GetParameters ();
+
+                       if (pars.Length != count)
+                               return false;
+
+                       for (int i = 0; i < count; i++)
+                               if (pars [i].ParameterType != sig.args [i])
+                                       return false;
+                       return true;
+               }
+       }
 
-       public TypeManager ()
+       // A delegate that points to the filter above.
+       static MemberFilter signature_filter;
+
+       //
+       // These are expressions that represent some of the internal data types, used
+       // elsewhere
+       //
+       static void InitExpressionTypes ()
+       {
+               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 ()
        {
-               assemblies = new ArrayList ();
-               modules = new ArrayList ();
+               assemblies = new Assembly [0];
+               modules = null;
                user_types = new ArrayList ();
+               
                types = new Hashtable ();
                typecontainers = new Hashtable ();
-               builder_to_interface = new PtrHashtable ();
-               builder_to_delegate = new PtrHashtable ();
-               builder_to_enum  = new PtrHashtable ();
+               
+               builder_to_member_finder = new PtrHashtable ();
                builder_to_attr = new PtrHashtable ();
-       }
-
-       static TypeManager ()
-       {
+               builder_to_method = new PtrHashtable ();
                method_arguments = new PtrHashtable ();
                method_internal_params = new PtrHashtable ();
-               builder_to_container = new PtrHashtable ();
-               type_interface_cache = new PtrHashtable ();
+               indexer_arguments = new PtrHashtable ();
+               builder_to_ifaces = new PtrHashtable ();
+               
+               NoTypes = new Type [0];
+
+               signature_filter = new MemberFilter (SignatureFilter);
+               InitExpressionTypes ();
        }
 
-       public void AddUserType (string name, TypeBuilder t)
+       public static void AddUserType (string name, TypeBuilder t, Type [] ifaces)
        {
-               types.Add (name, t);
+               try {
+                       types.Add (name, t);
+               } catch {
+                       Type prev = (Type) types [name];
+                       TypeContainer tc = builder_to_member_finder [prev] as TypeContainer;
+
+                       if (tc != null){
+                               //
+                               // This probably never happens, as we catch this before
+                               //
+                               Report.Error (-17, "The type `" + name + "' has already been defined.");
+                               return;
+                       }
+
+                       tc = builder_to_member_finder [t] as TypeContainer;
+                       
+                       Report.Warning (
+                               1595, "The type `" + name + "' is defined in an existing assembly;"+
+                               " Using the new definition from: " + tc.Location);
+                       Report.Warning (1595, "Previously defined in: " + prev.Assembly.FullName);
+                       
+                       types.Remove (name);
+                       types.Add (name, t);
+               }
                user_types.Add (t);
+                       
+               if (ifaces != null)
+                       builder_to_ifaces [t] = ifaces;
+       }
+
+       //
+       // This entry point is used by types that we define under the covers
+       // 
+       public static void RegisterBuilder (TypeBuilder tb, Type [] ifaces)
+       {
+               if (ifaces != null)
+                       builder_to_ifaces [tb] = ifaces;
        }
        
-       public void AddUserType (string name, TypeBuilder t, TypeContainer tc)
+       public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
        {
-               AddUserType (name, t);
-               builder_to_container.Add (t, tc);
+               builder_to_member_finder.Add (t, tc);
                typecontainers.Add (name, tc);
+               AddUserType (name, t, ifaces);
        }
 
-       public void AddDelegateType (string name, TypeBuilder t, Delegate del)
+       public static void AddDelegateType (string name, TypeBuilder t, Delegate del)
        {
                types.Add (name, t);
-               builder_to_delegate.Add (t, del);
+               builder_to_member_finder.Add (t, del);
        }
        
-       public void AddEnumType (string name, TypeBuilder t, Enum en)
+       public static void AddEnumType (string name, TypeBuilder t, Enum en)
        {
                types.Add (name, t);
-               builder_to_enum.Add (t, en);
+               builder_to_member_finder.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);
        }
 
-       public void AddUserInterface (string name, TypeBuilder t, Interface i)
+       public static void AddMethod (MethodBuilder builder, MethodData method)
        {
-               AddUserType (name, t);
-               builder_to_interface.Add (t, i);
+               builder_to_method.Add (builder, method);
        }
 
-       public void RegisterAttrType (Type t, TypeContainer tc)
+       public static void RegisterAttrType (Type t, TypeContainer tc)
        {
                builder_to_attr.Add (t, tc);
        }
-               
+
        /// <summary>
        ///   Returns the TypeContainer whose Type is `t' or null if there is no
        ///   TypeContainer for `t' (ie, the Type comes from a library)
        /// </summary>
        public static TypeContainer LookupTypeContainer (Type t)
        {
-               return (TypeContainer) builder_to_container [t];
+               return builder_to_member_finder [t] as TypeContainer;
        }
 
-       public Interface LookupInterface (Type t)
+       public static Interface LookupInterface (Type t)
        {
-               return (Interface) builder_to_interface [t];
+               return builder_to_member_finder [t] as Interface;
        }
 
        public static Delegate LookupDelegate (Type t)
        {
-               return (Delegate) builder_to_delegate [t];
+               return builder_to_member_finder [t] as Delegate;
        }
 
        public static Enum LookupEnum (Type t)
        {
-               return (Enum) builder_to_enum [t];
+               return builder_to_member_finder [t] as Enum;
        }
        
        public static TypeContainer LookupAttr (Type t)
@@ -242,23 +558,35 @@ public class TypeManager {
        /// <summary>
        ///   Registers an assembly to load types from.
        /// </summary>
-       public void AddAssembly (Assembly a)
+       public static void AddAssembly (Assembly a)
        {
-               assemblies.Add (a);
+               int top = assemblies.Length;
+               Assembly [] n = new Assembly [top + 1];
+
+               assemblies.CopyTo (n, 0);
+               
+               n [top] = a;
+               assemblies = n;
        }
 
        /// <summary>
        ///  Registers a module builder to lookup types from
        /// </summary>
-       public void AddModule (ModuleBuilder mb)
+       public static void AddModule (ModuleBuilder mb)
        {
-               modules.Add (mb);
+               int top = modules != null ? modules.Length : 0;
+               ModuleBuilder [] n = new ModuleBuilder [top + 1];
+
+               if (modules != null)
+                       modules.CopyTo (n, 0);
+               n [top] = mb;
+               modules = n;
        }
 
        /// <summary>
        ///   Returns the Type associated with @name
        /// </summary>
-       public Type LookupType (string name)
+       public static Type LookupType (string name)
        {
                Type t;
 
@@ -286,7 +614,7 @@ public class TypeManager {
                                return t;
                        }
                }
-
+               
                return null;
        }
 
@@ -295,47 +623,64 @@ public class TypeManager {
        /// </summary>
        static public string CSharpName (Type t)
        {
-               if (t == int32_type)
-                       return "int";
-               else if (t == uint32_type)
-                       return "uint";
-               else if (t == int64_type)
-                       return "long";
-               else if (t == uint64_type)
-                       return "ulong";
-               else if (t == float_type)
-                       return "float";
-               else if (t == double_type)
-                       return "double";
-               else if (t == char_type)
-                       return "char";
-               else if (t == short_type)
-                       return "short";
-               else if (t == decimal_type)
-                       return "decimal";
-               else if (t == bool_type)
-                       return "bool";
-               else if (t == sbyte_type)
-                       return "sbyte";
-               else if (t == byte_type)
-                       return "byte";
-               else if (t == short_type)
-                       return "short";
-               else if (t == ushort_type)
-                       return "ushort";
-               else if (t == string_type)
-                       return "string";
-               else if (t == object_type)
-                       return "object";
-               else
-                       return t.FullName;
+               return Regex.Replace (t.FullName, 
+                       @"^System\." +
+                       @"(Int32|UInt32|Int16|Uint16|Int64|UInt64|" +
+                       @"Single|Double|Char|Decimal|Byte|SByte|Object|" +
+                       @"Boolean|String|Void)" +
+                       @"(\W+|\b)", 
+                       new MatchEvaluator (CSharpNameMatch));
+       }       
+       
+       static String CSharpNameMatch (Match match) 
+       {
+               string s = match.Groups [1].Captures [0].Value;
+               return s.ToLower ().
+               Replace ("int32", "int").
+               Replace ("uint32", "uint").
+               Replace ("int16", "short").
+               Replace ("uint16", "ushort").
+               Replace ("int64", "long").
+               Replace ("uint64", "ulong").
+               Replace ("single", "float").
+               Replace ("boolean", "bool")
+               + match.Groups [2].Captures [0].Value;
        }
 
+        /// <summary>
+        ///   Returns the signature of the method
+        /// </summary>
+        static public string CSharpSignature (MethodBase mb)
+        {
+                string sig = "(";
+
+               //
+               // FIXME: We should really have a single function to do
+               // everything instead of the following 5 line pattern
+               //
+                ParameterData iparams = LookupParametersByBuilder (mb);
+
+               if (iparams == null){
+                       ParameterInfo [] pi = mb.GetParameters ();
+                       iparams = new ReflectionParameters (pi);
+               }
+               
+                for (int i = 0; i < iparams.Count; i++) {
+                        if (i > 0) {
+                                sig += ", ";
+                        }
+                        sig += iparams.ParameterDesc(i);
+                }
+                sig += ")";
+
+                return mb.DeclaringType.Name + "." + mb.Name + sig;
+        }
+
        /// <summary>
        ///   Looks up a type, and aborts if it is not found.  This is used
        ///   by types required by the compiler
        /// </summary>
-       Type CoreLookupType (string name)
+       static Type CoreLookupType (string name)
        {
                Type t = LookupType (name);
 
@@ -351,47 +696,88 @@ public class TypeManager {
        ///   Returns the MethodInfo for a method named `name' defined
        ///   in type `t' which takes arguments of types `args'
        /// </summary>
-       MethodInfo GetMethod (Type t, string name, Type [] args)
+       static MethodInfo GetMethod (Type t, string name, Type [] args)
        {
-               MethodInfo mi = t.GetMethod (name, args);
+               MemberList list;
+               Signature sig;
 
-               if (mi == null)
-                       throw new Exception ("Can not find the core function `" + name + "'");
+               sig.name = name;
+               sig.args = args;
+               
+               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;
+               }
+
+               MethodInfo mi = list [0] as MethodInfo;
+               if (mi == null) {
+                       Report.Error (-19, "Can not find the core function `" + name + "'");
+                       return null;
+               }
 
                return mi;
        }
 
-       ConstructorInfo GetConstructor (Type t, Type [] args)
+       /// <summary>
+       ///    Returns the ConstructorInfo for "args"
+       /// </summary>
+       static ConstructorInfo GetConstructor (Type t, Type [] args)
        {
-               ConstructorInfo ci = t.GetConstructor (args);
+               MemberList list;
+               Signature sig;
 
-               if (ci == null)
-                       throw new Exception ("Can not find the core constructor for `" + t.FullName + "'");
+               sig.name = ".ctor";
+               sig.args = args;
+               
+               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 ci;
        }
+
+       public static void InitEnumUnderlyingTypes ()
+       {
+
+               int32_type    = CoreLookupType ("System.Int32");
+               int64_type    = CoreLookupType ("System.Int64");
+               uint32_type   = CoreLookupType ("System.UInt32"); 
+               uint64_type   = CoreLookupType ("System.UInt64"); 
+               byte_type     = CoreLookupType ("System.Byte");
+               sbyte_type    = CoreLookupType ("System.SByte");
+               short_type    = CoreLookupType ("System.Int16");
+               ushort_type   = CoreLookupType ("System.UInt16");
+       }
        
        /// <remarks>
        ///   The types have to be initialized after the initial
        ///   population of the type has happened (for example, to
        ///   bootstrap the corlib.dll
        /// </remarks>
-       public void InitCoreTypes ()
+       public static void InitCoreTypes ()
        {
                object_type   = CoreLookupType ("System.Object");
                value_type    = CoreLookupType ("System.ValueType");
+
+               InitEnumUnderlyingTypes ();
+
+               char_type     = CoreLookupType ("System.Char");
                string_type   = CoreLookupType ("System.String");
-               int32_type    = CoreLookupType ("System.Int32");
-               int64_type    = CoreLookupType ("System.Int64");
-               uint32_type   = CoreLookupType ("System.UInt32"); 
-               uint64_type   = CoreLookupType ("System.UInt64"); 
                float_type    = CoreLookupType ("System.Single");
                double_type   = CoreLookupType ("System.Double");
-               byte_type     = CoreLookupType ("System.Byte");
-               sbyte_type    = CoreLookupType ("System.SByte");
-               char_type     = CoreLookupType ("System.Char");
-               short_type    = CoreLookupType ("System.Int16");
-               ushort_type   = CoreLookupType ("System.UInt16");
+               char_ptr_type = CoreLookupType ("System.Char*");
                decimal_type  = CoreLookupType ("System.Decimal");
                bool_type     = CoreLookupType ("System.Boolean");
                enum_type     = CoreLookupType ("System.Enum");
@@ -415,11 +801,80 @@ public class TypeManager {
                monitor_type         = CoreLookupType ("System.Threading.Monitor");
                intptr_type          = CoreLookupType ("System.IntPtr");
 
+               attribute_type       = CoreLookupType ("System.Attribute");
                attribute_usage_type = CoreLookupType ("System.AttributeUsageAttribute");
                dllimport_type       = CoreLookupType ("System.Runtime.InteropServices.DllImportAttribute");
                methodimpl_attr_type = CoreLookupType ("System.Runtime.CompilerServices.MethodImplAttribute");
-               param_array_type     = CoreLookupType ("System.ParamArrayAttribute");
-               
+               marshal_as_attr_type  = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
+               param_array_type      = CoreLookupType ("System.ParamArrayAttribute");
+
+               unverifiable_code_type= CoreLookupType ("System.Security.UnverifiableCodeAttribute");
+
+               void_ptr_type         = CoreLookupType ("System.Void*");
+
+               indexer_name_type     = CoreLookupType ("System.Runtime.CompilerServices.IndexerNameAttribute");
+
+               exception_type        = CoreLookupType ("System.Exception");
+
+               //
+               // Attribute types
+               //
+               obsolete_attribute_type = CoreLookupType ("System.ObsoleteAttribute");
+               conditional_attribute_type = CoreLookupType ("System.Diagnostics.ConditionalAttribute");
+
+               //
+               // When compiling corlib, store the "real" types here.
+               //
+               if (!RootContext.StdLib) {
+                       system_int32_type = typeof (System.Int32);
+                       system_array_type = typeof (System.Array);
+                       system_type_type = typeof (System.Type);
+                       system_assemblybuilder_type = typeof (System.Reflection.Emit.AssemblyBuilder);
+
+                       Type [] void_arg = {  };
+                       system_int_array_get_length = GetMethod (
+                               system_array_type, "get_Length", void_arg);
+                       system_int_array_get_rank = GetMethod (
+                               system_array_type, "get_Rank", void_arg);
+                       system_object_array_clone = GetMethod (
+                               system_array_type, "Clone", void_arg);
+
+                       Type [] system_int_arg = { system_int32_type };
+                       system_int_array_get_length_int = GetMethod (
+                               system_array_type, "GetLength", system_int_arg);
+                       system_int_array_get_upper_bound_int = GetMethod (
+                               system_array_type, "GetUpperBound", system_int_arg);
+                       system_int_array_get_lower_bound_int = GetMethod (
+                               system_array_type, "GetLowerBound", system_int_arg);
+
+                       Type [] system_array_int_arg = { system_array_type, system_int32_type };
+                       system_void_array_copyto_array_int = GetMethod (
+                               system_array_type, "CopyTo", system_array_int_arg);
+
+                       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");
+                       }
+               }
+       }
+
+       //
+       // The helper methods that are used by the compiler
+       //
+       public static void InitCodeHelpers ()
+       {
                //
                // Now load the default methods that we use.
                //
@@ -456,7 +911,33 @@ public class TypeManager {
                        ienumerator_type, "MoveNext", void_arg);
                void_dispose_void = GetMethod (
                        idisposable_type, "Dispose", void_arg);
+               int_get_offset_to_string_data = GetMethod (
+                       runtime_helpers_type, "get_OffsetToStringData", void_arg);
+               int_array_get_length = GetMethod (
+                       array_type, "get_Length", void_arg);
+               int_array_get_rank = GetMethod (
+                       array_type, "get_Rank", void_arg);
 
+               //
+               // Int32 arguments
+               //
+               Type [] int_arg = { int32_type };
+               int_array_get_length_int = GetMethod (
+                       array_type, "GetLength", int_arg);
+               int_array_get_upper_bound_int = GetMethod (
+                       array_type, "GetUpperBound", int_arg);
+               int_array_get_lower_bound_int = GetMethod (
+                       array_type, "GetLowerBound", int_arg);
+
+               //
+               // System.Array methods
+               //
+               object_array_clone = GetMethod (
+                       array_type, "Clone", void_arg);
+               Type [] array_int_arg = { array_type, int32_type };
+               void_array_copyto_array_int = GetMethod (
+                       array_type, "CopyTo", array_int_arg);
+               
                //
                // object arguments
                //
@@ -474,22 +955,63 @@ public class TypeManager {
                //
                // Array functions
                //
-               Type [] int_arg = { int32_type };
                int_getlength_int = GetMethod (
                        array_type, "GetLength", int_arg);
+
+               //
+               // Decimal constructors
+               //
+               Type [] dec_arg = { int32_type, int32_type, int32_type, bool_type, byte_type };
+               void_decimal_ctor_five_args = GetConstructor (
+                       decimal_type, dec_arg);
                
                //
                // Attributes
                //
                cons_param_array_attribute = GetConstructor (
                        param_array_type, void_arg);
+
+               unverifiable_code_ctor = GetConstructor (
+                       unverifiable_code_type, void_arg);
                
        }
 
        const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
-       
-       public MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
-                                         MemberFilter filter, object criteria)
+
+       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);
+               }
+
+               if (filter != FilterWithClosure_delegate)
+                       return new MemberList (RealFindMembers (t, mt, bf, filter, criteria));
+
+               caching_finder = new TypeHandle (t);
+               builder_to_member_finder.Add (t, caching_finder);
+
+               return caching_finder.FindMembers (mt, bf, (string) criteria, filter, 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)
        {
                //
                // We have to take care of arrays specially, because GetType on
@@ -498,59 +1020,48 @@ public class TypeManager {
                //
                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);
-                               MemberInfo [] s_members = t.FindMembers (
-                                       mt, bf & ~BindingFlags.Instance, filter, criteria);
-
-                               int i_len = i_members.Length;
-                               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
-                                       return i_members;
-                       }
-                       return t.FindMembers (mt, bf, filter, criteria);
-               }
 
+               if (t is TypeBuilder)
+                       return null;
+               
                //
-               // 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
+               // Since FindMembers will not lookup both static and instance
+               // members, we emulate this behaviour here.
                //
-               Enum e = (Enum) builder_to_enum [t];
-
-               if (e != null)
-                       return e.FindMembers (mt, bf, filter, criteria);
-               
-               Delegate del = (Delegate) builder_to_delegate [t];
-
-               if (del != null)
-                       return del.FindMembers (mt, bf, filter, criteria);
-
-               Interface iface = (Interface) builder_to_interface [t];
+               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;
+                       }
+                               
+                       MemberInfo [] s_members = t.FindMembers (
+                               mt, bf & ~BindingFlags.Instance, filter, criteria);
 
-               if (iface != null) 
-                       return iface.FindMembers (mt, bf, filter, criteria);
-               
-               TypeContainer tc = (TypeContainer) builder_to_container [t];
+                       int s_len = s_members.Length;
+                       if (i_len > 0 || s_len > 0){
+                               MemberInfo [] both = new MemberInfo [i_len + s_len];
 
-               if (tc != null)
-                       return tc.FindMembers (mt, bf, filter, criteria);
+                               i_members.CopyTo (both, 0);
+                               s_members.CopyTo (both, i_len);
 
-               return null;
+                               return both;
+                       } else {
+                               if (i_len > 0)
+                                       return i_members;
+                               else
+                                       return s_members;
+                       }
+               }
+               return t.FindMembers (mt, bf, filter, criteria);
        }
 
        public static bool IsBuiltinType (Type t)
@@ -558,7 +1069,7 @@ public class TypeManager {
                if (t == object_type || t == string_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 == decimal_type || t == bool_type ||
-                   t == sbyte_type || t == byte_type || t == ushort_type)
+                   t == sbyte_type || t == byte_type || t == ushort_type || t == void_type)
                        return true;
                else
                        return false;
@@ -580,9 +1091,17 @@ public class TypeManager {
                        return false;
        }
        
+       public static bool IsValueType (Type t)
+       {
+               if (t.IsSubclassOf (TypeManager.value_type))
+                       return true;
+               else
+                       return false;
+       }
+       
        public static bool IsInterfaceType (Type t)
        {
-               Interface iface = (Interface) builder_to_interface [t];
+               Interface iface = builder_to_member_finder [t] as Interface;
 
                if (iface != null)
                        return true;
@@ -590,16 +1109,32 @@ public class TypeManager {
                        return false;
        }
 
+       //
+       // Checks whether `type' is a subclass or nested child of `parent'.
+       //
+       public static bool IsSubclassOrNestedChildOf (Type type, Type parent)
+       {
+               do {
+                       if (type.IsSubclassOf (parent))
+                               return true;
+
+                       // Handle nested types.
+                       type = type.DeclaringType;
+               } while (type != null);
+
+               return false;
+       }
+
        /// <summary>
        ///   Returns the User Defined Types
        /// </summary>
-       public ArrayList UserTypes {
+       public static ArrayList UserTypes {
                get {
                        return user_types;
                }
        }
 
-       public Hashtable TypeContainers {
+       public static Hashtable TypeContainers {
                get {
                        return typecontainers;
                }
@@ -626,18 +1161,20 @@ public class TypeManager {
                return (Const) builder_to_constant [fb];
        }
        
-       //
-       // Gigantic work around for stupidity in System.Reflection.Emit follows
-       //
-       // Since System.Reflection.Emit can not return MethodBase.GetParameters
-       // for anything which is dynamic, and we need this in a number of places,
-       // we register this information here, and use it afterwards.
-       //
+       /// <summary>
+       ///   Gigantic work around for missing features in System.Reflection.Emit follows.
+       /// </summary>
+       ///
+       /// <remarks>
+       ///   Since System.Reflection.Emit can not return MethodBase.GetParameters
+       ///   for anything which is dynamic, and we need this in a number of places,
+       ///   we register this information here, and use it afterwards.
+       /// </remarks>
        static public bool RegisterMethod (MethodBase mb, InternalParameters ip, Type [] args)
        {
-               if (method_arguments.Contains (mb))
-                       return false;
-               
+               if (args == null)
+                       args = NoTypes;
+                               
                method_arguments.Add (mb, args);
                method_internal_params.Add (mb, ip);
                
@@ -646,8 +1183,6 @@ public class TypeManager {
        
        static public InternalParameters LookupParametersByBuilder (MethodBase mb)
        {
-               object o = method_arguments [mb];
-
                if (! (mb is ConstructorBuilder || mb is MethodBuilder))
                        return null;
                
@@ -680,6 +1215,38 @@ public class TypeManager {
                        return types;
                }
        }
+
+       /// <summary>
+       ///    Returns the argument types for an indexer based on its PropertyInfo
+       ///
+       ///    For dynamic indexers, we use the compiler provided types, for
+       ///    indexers from existing assemblies we load them from GetParameters,
+       ///    and insert them into the cache
+       /// </summary>
+       static public Type [] GetArgumentTypes (PropertyInfo indexer)
+       {
+               if (indexer_arguments.Contains (indexer))
+                       return (Type []) indexer_arguments [indexer];
+               else if (indexer is PropertyBuilder)
+                       // If we're a PropertyBuilder and not in the
+                       // `indexer_arguments' hash, then we're a property and
+                       // not an indexer.
+                       return NoTypes;
+               else {
+                       ParameterInfo [] pi = indexer.GetIndexParameters ();
+                       // Property, not an indexer.
+                       if (pi == null)
+                               return NoTypes;
+                       int c = pi.Length;
+                       Type [] types = new Type [c];
+                       
+                       for (int i = 0; i < c; i++)
+                               types [i] = pi [i].ParameterType;
+
+                       indexer_arguments.Add (indexer, types);
+                       return types;
+               }
+       }
        
        // <remarks>
        //  This is a workaround the fact that GetValue is not
@@ -702,7 +1269,7 @@ public class TypeManager {
        }
 
        static Hashtable fieldbuilders_to_fields = new Hashtable ();
-       static public bool RegisterField (FieldBuilder fb, Field f)
+       static public bool RegisterFieldBase (FieldBuilder fb, FieldBase f)
        {
                if (fieldbuilders_to_fields.Contains (fb))
                        return false;
@@ -711,9 +1278,9 @@ public class TypeManager {
                return true;
        }
 
-       static public Field GetField (FieldInfo fb)
+       static public FieldBase GetField (FieldInfo fb)
        {
-               return (Field) fieldbuilders_to_fields [fb];
+               return (FieldBase) fieldbuilders_to_fields [fb];
        }
        
        static Hashtable events;
@@ -751,6 +1318,26 @@ public class TypeManager {
                        return ei.GetAddMethod ();
        }
 
+       static Hashtable priv_fields_events;
+
+       static public bool RegisterPrivateFieldOfEvent (EventInfo einfo, FieldBuilder builder)
+       {
+               if (priv_fields_events == null)
+                       priv_fields_events = new Hashtable ();
+
+               if (priv_fields_events.Contains (einfo))
+                       return false;
+
+               priv_fields_events.Add (einfo, builder);
+
+               return true;
+       }
+
+       static public MemberInfo GetPrivateFieldOfEvent (EventInfo ei)
+       {
+               return (MemberInfo) priv_fields_events [ei];
+       }
+               
        static Hashtable properties;
        
        static public bool RegisterProperty (PropertyBuilder pb, MethodBase get, MethodBase set)
@@ -765,7 +1352,17 @@ public class TypeManager {
 
                return true;
        }
-       
+
+       static public bool RegisterIndexer (PropertyBuilder pb, MethodBase get, MethodBase set, Type[] args)
+       {
+               if (!RegisterProperty (pb, get,set))
+                       return false;
+
+               indexer_arguments.Add (pb, args);
+
+               return true;
+       }
+
        //
        // FIXME: we need to return the accessors depending on whether
        // they are visible or not.
@@ -816,31 +1413,160 @@ public class TypeManager {
                } else
                        return pi.GetGetMethod ();
        }
-                               
-       // <remarks>
-       //  The following is used to check if a given type implements an interface.
-       //  The cache helps us reduce the expense of hitting Type.GetInterfaces everytime.
-       // </remarks>
 
-       static Hashtable type_interface_cache;
+       /// <summary>
+       ///   Given an array of interface types, expand and eliminate repeated ocurrences
+       ///   of an interface.  
+       /// </summary>
+       ///
+       /// <remarks>
+       ///   This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
+       ///   be IA, IB, IC.
+       /// </remarks>
+       public static Type [] ExpandInterfaces (Type [] base_interfaces)
+       {
+               ArrayList new_ifaces = new ArrayList ();
+               
+               foreach (Type iface in base_interfaces){
+                       if (!new_ifaces.Contains (iface))
+                               new_ifaces.Add (iface);
+                       
+                       Type [] implementing = TypeManager.GetInterfaces (iface);
+                       
+                       foreach (Type imp in implementing){
+                               if (!new_ifaces.Contains (imp))
+                                       new_ifaces.Add (imp);
+                       }
+               }
+               Type [] ret = new Type [new_ifaces.Count];
+               new_ifaces.CopyTo (ret, 0);
+               return ret;
+       }
+               
+       /// <summary>
+       ///   This function returns the interfaces in the type `t'.  Works with
+       ///   both types and TypeBuilders.
+       /// </summary>
+       public static Type [] GetInterfaces (Type t)
+       {
+               //
+               // The reason for catching the Array case is that Reflection.Emit
+               // will not return a TypeBuilder for Array types of TypeBuilder types,
+               // but will still throw an exception if we try to call GetInterfaces
+               // on the type.
+               //
+               // Since the array interfaces are always constant, we return those for
+               // the System.Array
+               //
+               
+               if (t.IsArray)
+                       t = TypeManager.array_type;
+               
+               if (t is TypeBuilder){
+                       Type [] parent_ifaces;
+                       
+                       if (t.BaseType == null)
+                               parent_ifaces = NoTypes;
+                       else
+                               parent_ifaces = GetInterfaces (t.BaseType);
+                       Type [] type_ifaces = (Type []) builder_to_ifaces [t];
+                       if (type_ifaces == null)
+                               type_ifaces = NoTypes;
+
+                       int parent_count = parent_ifaces.Length;
+                       Type [] result = new Type [parent_count + type_ifaces.Length];
+                       parent_ifaces.CopyTo (result, 0);
+                       type_ifaces.CopyTo (result, parent_count);
+
+                       return result;
+               } else
+                       return t.GetInterfaces ();
+       }
+       
+       /// <remarks>
+       ///  The following is used to check if a given type implements an interface.
+       ///  The cache helps us reduce the expense of hitting Type.GetInterfaces everytime.
+       /// </remarks>
        public static bool ImplementsInterface (Type t, Type iface)
        {
                Type [] interfaces;
 
+               //
+               // FIXME OPTIMIZATION:
+               // as soon as we hit a non-TypeBuiler in the interface
+               // chain, we could return, as the `Type.GetInterfaces'
+               // will return all the interfaces implement by the type
+               // or its parents.
+               //
                do {
-                       interfaces = t.GetInterfaces ();
+                       interfaces = GetInterfaces (t);
 
-                       for (int i = interfaces.Length; i > 0; ){
-                               i--;
-                               if (interfaces [i] == iface)
-                                       return true;
+                       if (interfaces != null){
+                               foreach (Type i in interfaces){
+                                       if (i == iface)
+                                               return true;
+                               }
                        }
+                       
                        t = t.BaseType;
                } while (t != null);
                
                return false;
        }
 
+       // 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)
+       {
+               if (!(value is IConvertible))
+                       throw new ArgumentException ();
+
+               IConvertible convertValue = (IConvertible) value;
+               CultureInfo ci = CultureInfo.CurrentCulture;
+               NumberFormatInfo provider = ci.NumberFormat;
+
+               //
+               // We must use Type.Equals() here since `conversionType' is
+               // the TypeBuilder created version of a system type and not
+               // the system type itself.  You cannot use Type.GetTypeCode()
+               // on such a type - it'd always return TypeCode.Object.
+               //
+               if (conversionType.Equals (typeof (Boolean)))
+                       return (object)(convertValue.ToBoolean (provider));
+               else if (conversionType.Equals (typeof (Byte)))
+                       return (object)(convertValue.ToByte (provider));
+               else if (conversionType.Equals (typeof (Char)))
+                       return (object)(convertValue.ToChar (provider));
+               else if (conversionType.Equals (typeof (DateTime)))
+                       return (object)(convertValue.ToDateTime (provider));
+               else if (conversionType.Equals (typeof (Decimal)))
+                       return (object)(convertValue.ToDecimal (provider));
+               else if (conversionType.Equals (typeof (Double)))
+                       return (object)(convertValue.ToDouble (provider));
+               else if (conversionType.Equals (typeof (Int16)))
+                       return (object)(convertValue.ToInt16 (provider));
+               else if (conversionType.Equals (typeof (Int32)))
+                       return (object)(convertValue.ToInt32 (provider));
+               else if (conversionType.Equals (typeof (Int64)))
+                       return (object)(convertValue.ToInt64 (provider));
+               else if (conversionType.Equals (typeof (SByte)))
+                       return (object)(convertValue.ToSByte (provider));
+               else if (conversionType.Equals (typeof (Single)))
+                       return (object)(convertValue.ToSingle (provider));
+               else if (conversionType.Equals (typeof (String)))
+                       return (object)(convertValue.ToString (provider));
+               else if (conversionType.Equals (typeof (UInt16)))
+                       return (object)(convertValue.ToUInt16 (provider));
+               else if (conversionType.Equals (typeof (UInt32)))
+                       return (object)(convertValue.ToUInt32 (provider));
+               else if (conversionType.Equals (typeof (UInt64)))
+                       return (object)(convertValue.ToUInt64 (provider));
+               else if (conversionType.Equals (typeof (Object)))
+                       return (object)(value);
+               else 
+                       throw new InvalidCastException ();
+       }
+
        //
        // This is needed, because enumerations from assemblies
        // do not report their underlyingtype, but they report
@@ -848,10 +1574,64 @@ public class TypeManager {
        //
        public static Type EnumToUnderlying (Type t)
        {
+               if (t == TypeManager.enum_type)
+                       return t;
+
                t = t.UnderlyingSystemType;
                if (!TypeManager.IsEnumType (t))
                        return t;
-               
+       
+               if (t is TypeBuilder) {
+                       // slow path needed to compile corlib
+                       if (t == TypeManager.bool_type ||
+                                       t == TypeManager.byte_type ||
+                                       t == TypeManager.sbyte_type ||
+                                       t == TypeManager.char_type ||
+                                       t == TypeManager.short_type ||
+                                       t == TypeManager.ushort_type ||
+                                       t == TypeManager.int32_type ||
+                                       t == TypeManager.uint32_type ||
+                                       t == TypeManager.int64_type ||
+                                       t == TypeManager.uint64_type)
+                               return t;
+                       throw new Exception ("Unhandled typecode in enum " + " from " + t.AssemblyQualifiedName);
+               }
+               TypeCode tc = Type.GetTypeCode (t);
+
+               switch (tc){
+               case TypeCode.Boolean:
+                       return TypeManager.bool_type;
+               case TypeCode.Byte:
+                       return TypeManager.byte_type;
+               case TypeCode.SByte:
+                       return TypeManager.sbyte_type;
+               case TypeCode.Char:
+                       return TypeManager.char_type;
+               case TypeCode.Int16:
+                       return TypeManager.short_type;
+               case TypeCode.UInt16:
+                       return TypeManager.ushort_type;
+               case TypeCode.Int32:
+                       return TypeManager.int32_type;
+               case TypeCode.UInt32:
+                       return TypeManager.uint32_type;
+               case TypeCode.Int64:
+                       return TypeManager.int64_type;
+               case TypeCode.UInt64:
+                       return TypeManager.uint64_type;
+               }
+               throw new Exception ("Unhandled typecode in enum " + tc + " from " + t.AssemblyQualifiedName);
+       }
+
+       //
+       // When compiling corlib and called with one of the core types, return
+       // the corresponding typebuilder for that type.
+       //
+       public static Type TypeToCoreType (Type t)
+       {
+               if (RootContext.StdLib || (t is TypeBuilder))
+                       return t;
+
                TypeCode tc = Type.GetTypeCode (t);
 
                switch (tc){
@@ -875,8 +1655,44 @@ public class TypeManager {
                        return TypeManager.int64_type;
                case TypeCode.UInt64:
                        return TypeManager.uint64_type;
+               case TypeCode.String:
+                       return TypeManager.string_type;
+               default:
+                       if (t == typeof (void))
+                               return TypeManager.void_type;
+                       if (t == typeof (object))
+                               return TypeManager.object_type;
+                       if (t == typeof (System.Type))
+                               return TypeManager.type_type;
+                       return t;
                }
-               throw new Exception ("Unhandled typecode in enum" + tc);
+       }
+
+       /// <summary>
+       ///   Utility function that can be used to probe whether a type
+       ///   is managed or not.  
+       /// </summary>
+       public static bool VerifyUnManaged (Type t, Location loc)
+       {
+               if (t.IsValueType || t.IsPointer){
+                       //
+                       // FIXME: this is more complex, we actually need to
+                       // make sure that the type does not contain any
+                       // classes itself
+                       //
+                       return true;
+               }
+
+               if (!RootContext.StdLib && (t == TypeManager.decimal_type))
+                       // We need this explicit check here to make it work when
+                       // compiling corlib.
+                       return true;
+
+               Report.Error (
+                       208, loc,
+                       "Cannot take the address or size of a variable of a managed type ('" +
+                       CSharpName (t) + "')");
+               return false;   
        }
        
        /// <summary>
@@ -890,44 +1706,708 @@ public class TypeManager {
        /// </remarks>
        public static string IndexerPropertyName (Type t)
        {
-               
                if (t is TypeBuilder) {
-                       TypeContainer tc = (TypeContainer) builder_to_container [t];
+                       if (t.IsInterface) {
+                               Interface i = LookupInterface (t);
+
+                               if ((i == null) || (i.IndexerName == null))
+                                       return "Item";
+
+                               return i.IndexerName;
+                       } else {
+                               TypeContainer tc = LookupTypeContainer (t);
+
+                               if ((tc == null) || (tc.IndexerName == null))
+                                       return "Item";
+
+                               return tc.IndexerName;
+                       }
+               }
+               
+               System.Attribute attr = System.Attribute.GetCustomAttribute (
+                       t, TypeManager.default_member_type);
+               if (attr != null){
+                       DefaultMemberAttribute dma = (DefaultMemberAttribute) attr;
+                       return dma.MemberName;
+               }
+
+               return "Item";
+       }
+
+       public static void MakePinned (LocalBuilder builder)
+       {
+               //
+               // FIXME: Flag the "LocalBuilder" type as being
+               // pinned.  Figure out API.
+               //
+       }
 
-                       Attributes attrs = tc.OptAttributes;
+
+       //
+       // Returns whether the array of memberinfos contains the given method
+       //
+       static bool ArrayContainsMethod (MemberInfo [] array, MethodBase new_method)
+       {
+               Type [] new_args = TypeManager.GetArgumentTypes (new_method);
+               
+               foreach (MethodBase method in array){
+                       if (method.Name != new_method.Name)
+                               continue;
+                       
+                       Type [] old_args = TypeManager.GetArgumentTypes (method);
+                       int old_count = old_args.Length;
+                       int i;
+                       
+                       if (new_args.Length != old_count)
+                               continue;
                        
-                       if (attrs == null || attrs.AttributeSections == null)
-                               return "Item";
+                       for (i = 0; i < old_count; i++){
+                               if (old_args [i] != new_args [i])
+                                       break;
+                       }
+                       if (i != old_count)
+                               continue;
 
-                       foreach (AttributeSection asec in attrs.AttributeSections) {
+                       return true;
+               }
+               return false;
+       }
+       
+       //
+       // We copy methods from `new_members' into `target_list' if the signature
+       // for the method from in the new list does not exist in the target_list
+       //
+       // The name is assumed to be the same.
+       //
+       public static ArrayList CopyNewMethods (ArrayList target_list, MemberList new_members)
+       {
+               if (target_list == null){
+                       target_list = new ArrayList ();
 
-                               if (asec.Attributes == null)
-                                       continue;
+                       foreach (MemberInfo mi in new_members){
+                               if (mi is MethodBase)
+                                       target_list.Add (mi);
+                       }
+                       return target_list;
+               }
+               
+               MemberInfo [] target_array = new MemberInfo [target_list.Count];
+               target_list.CopyTo (target_array, 0);
+               
+               foreach (MemberInfo mi in new_members){
+                       MethodBase new_method = (MethodBase) mi;
+                       
+                       if (!ArrayContainsMethod (target_array, new_method))
+                               target_list.Add (new_method);
+               }
+               return target_list;
+       }
 
-                               foreach (Attribute a in asec.Attributes) {
-                                       if (a.Name.IndexOf ("DefaultMember") != -1) {
-                                               ArrayList pos_args = (ArrayList) a.Arguments [0];
+       [Flags]
+       public enum MethodFlags {
+               IsObsolete = 1,
+               IsObsoleteError = 2,
+               ShouldIgnore = 3
+       }
+       
+       //
+       // Returns the TypeManager.MethodFlags for this method.
+       // This emits an error 619 / warning 618 if the method is obsolete.
+       // In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
+       //
+       static public MethodFlags GetMethodFlags (MethodBase mb, Location loc)
+       {
+               MethodFlags flags = 0;
+               
+               if (mb.DeclaringType is TypeBuilder){
+                       MethodData method = (MethodData) builder_to_method [mb];
+                       if (method == null) {
+                               // FIXME: implement Obsolete attribute on Property,
+                               //        Indexer and Event.
+                               return 0;
+                       }
 
-                                               return (string) pos_args [0];
-                                       }
-                               }
+                       return method.GetMethodFlags (loc);
+               }
+
+               object [] attrs = mb.GetCustomAttributes (true);
+               foreach (object ta in attrs){
+                       if (!(ta is System.Attribute)){
+                               Console.WriteLine ("Unknown type in GetMethodFlags: " + ta);
+                               continue;
                        }
+                       System.Attribute a = (System.Attribute) ta;
+                       if (a.TypeId == TypeManager.obsolete_attribute_type){
+                               ObsoleteAttribute oa = (ObsoleteAttribute) a;
+
+                               string method_desc = TypeManager.CSharpSignature (mb);
+
+                               if (oa.IsError) {
+                                       Report.Error (619, loc, "Method `" + method_desc +
+                                                     "' is obsolete: `" + oa.Message + "'");
+                                       return MethodFlags.IsObsoleteError;
+                               } else
+                                       Report.Warning (618, loc, "Method `" + method_desc +
+                                                       "' is obsolete: `" + oa.Message + "'");
+
+                               flags |= MethodFlags.IsObsolete;
+
+                               continue;
+                       }
+                       
+                       //
+                       // Skip over conditional code.
+                       //
+                       if (a.TypeId == TypeManager.conditional_attribute_type){
+                               ConditionalAttribute ca = (ConditionalAttribute) a;
 
-                       return "Item";
+                               if (RootContext.AllDefines [ca.ConditionString] == null)
+                                       flags |= MethodFlags.ShouldIgnore;
+                       }
                }
+
+               return flags;
+       }
+       
+#region MemberLookup implementation
+       
+       //
+       // Name of the member
+       //
+       static string   closure_name;
+
+       //
+       // Whether we allow private members in the result (since FindMembers
+       // uses NonPublic for both protected and private), we need to distinguish.
+       //
+       static bool     closure_private_ok;
+
+       //
+       // Who is invoking us and which type is being queried currently.
+       //
+       static Type     closure_invocation_type;
+       static Type     closure_queried_type;
+       static Type     closure_start_type;
+
+       //
+       // The assembly that defines the type is that is calling us
+       //
+       static Assembly closure_invocation_assembly;
+
+       //
+       // This filter filters by name + whether it is ok to include private
+       // members in the search
+       //
+       static internal bool FilterWithClosure (MemberInfo m, object filter_criteria)
+       {
+               //
+               // Hack: we know that the filter criteria will always be in the `closure'
+               // fields. 
+               //
+
+               if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
+                       return false;
+
+               //
+               // Ugly: we need to find out the type of `m', and depending
+               // on this, tell whether we accept or not
+               //
+               if (m is MethodBase){
+                       MethodBase mb = (MethodBase) m;
+                       MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
+
+                       if (ma == MethodAttributes.Private)
+                               return closure_private_ok;
+
+                       //
+                       // FamAndAssem requires that we not only derivate, but we are on the
+                       // same assembly.  
+                       //
+                       if (ma == MethodAttributes.FamANDAssem){
+                               if (closure_invocation_assembly != mb.DeclaringType.Assembly)
+                                       return false;
+                       }
+
+                       // Assembly and FamORAssem succeed if we're in the same assembly.
+                       if ((ma == MethodAttributes.Assembly) || (ma == MethodAttributes.FamORAssem)){
+                               if (closure_invocation_assembly == mb.DeclaringType.Assembly)
+                                       return true;
+                       }
+
+                       // We already know that we aren't in the same assembly.
+                       if (ma == MethodAttributes.Assembly)
+                               return false;
+
+                       // Family and FamANDAssem require that we derive.
+                       if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem)){
+                               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 ((closure_invocation_type != closure_start_type) &&
+                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                                       return false;
+
+                               return true;
+                       }
+
+                       // Public.
+                       return true;
+               }
+
+               if (m is FieldInfo){
+                       FieldInfo fi = (FieldInfo) m;
+                       FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
+
+                       if (fa == FieldAttributes.Private)
+                               return closure_private_ok;
+
+                       //
+                       // FamAndAssem requires that we not only derivate, but we are on the
+                       // same assembly.  
+                       //
+                       if (fa == FieldAttributes.FamANDAssem){
+                               if (closure_invocation_assembly != fi.DeclaringType.Assembly)
+                                       return false;
+                       }
+
+                       // Assembly and FamORAssem succeed if we're in the same assembly.
+                       if ((fa == FieldAttributes.Assembly) || (fa == FieldAttributes.FamORAssem)){
+                               if (closure_invocation_assembly == fi.DeclaringType.Assembly)
+                                       return true;
+                       }
+
+                       // We already know that we aren't in the same assembly.
+                       if (fa == FieldAttributes.Assembly)
+                               return false;
+
+                       // Family and FamANDAssem require that we derive.
+                       if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem)){
+                               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 ((closure_invocation_type != closure_start_type) &&
+                                   closure_invocation_type.IsSubclassOf (closure_start_type))
+                                       return false;
+
+                               return true;
+                       }
+
+                       // Public.
+                       return true;
+               }
+
+               //
+               // EventInfos and PropertyInfos, return true
+               //
+               return true;
+       }
+
+       static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
+
+       //
+       // 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'.
+       //
+       // The binding flags are `bf' and the kind of members being looked up are `mt'
+       //
+       // 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)
+       {
+               Timer.StartTimer (TimerType.MemberLookup);
+
+               MemberInfo[] retval = RealMemberLookup (invocation_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)
+       {
+               BindingFlags bf = original_bf;
                
-               System.Attribute attr = System.Attribute.GetCustomAttribute (t, TypeManager.default_member_type);
+               ArrayList method_list = null;
+               Type current_type = queried_type;
+               bool searching = (original_bf & BindingFlags.DeclaredOnly) == 0;
+               bool private_ok;
+               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;
+
+               //
+               // If we are a nested class, we always have access to our container
+               // type names
+               //
+               if (invocation_type != null){
+                       string invocation_name = invocation_type.FullName;
+                       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);
+                               
+                                       if (shared == container)
+                                               always_ok_flag = true;
+                               }
+                       }
+               }
                
-               if (attr != null)
-               {
-                       DefaultMemberAttribute dma = (DefaultMemberAttribute) attr;
+               do {
+                       MemberList list;
+
+                       //
+                       // `NonPublic' is lame, because it includes both protected and
+                       // private methods, so we need to control this behavior by
+                       // explicitly tracking if a private method is ok or not.
+                       //
+                       // The possible cases are:
+                       //    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;
+                       }
+
+                       closure_private_ok = private_ok;
+                       closure_queried_type = current_type;
+
+                       Timer.StopTimer (TimerType.MemberLookup);
+
+                       if (MemberCache.IsSingleMemberType (mt)) {
+                               searching = false;
+                               list = TypeManager.FindMembers (current_type, mt, bf,
+                                       FilterWithClosure_delegate, name);
+                       } else
+                               list = TypeManager.FindMembers (
+                                       current_type, mt, bf | BindingFlags.DeclaredOnly,
+                                       FilterWithClosure_delegate, name);
                        
-                       return dma.MemberName;
+                       Timer.StartTimer (TimerType.MemberLookup);
+
+                       if (current_type == TypeManager.object_type)
+                               searching = false;
+                       else {
+                               current_type = current_type.BaseType;
+                               
+                               //
+                               // This happens with interfaces, they have a null
+                               // basetype.  Look members up in the Object class.
+                               //
+                               if (current_type == null)
+                                       current_type = TypeManager.object_type;
+                       }
+                       
+                       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 (list.Count == 1 && !(list [0] is MethodBase)){
+                               return (MemberInfo []) list;
+                       }
+
+                       //
+                       // Multiple properties: we query those just to find out the indexer
+                       // name
+                       //
+                       if (list [0] is PropertyInfo)
+                               return (MemberInfo []) list;
+
+                       //
+                       // 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));
+       
+               //
+               // Interfaces do not list members they inherit, so we have to
+               // scan those.
+               // 
+               if (!queried_type.IsInterface)
+                       return null;
+
+               if (queried_type.IsArray)
+                       queried_type = TypeManager.array_type;
+               
+               Type [] ifaces = GetInterfaces (queried_type);
+               if (ifaces == null)
+                       return null;
+               
+               foreach (Type itype in ifaces){
+                       MemberInfo [] x;
+
+                       x = MemberLookup (null, itype, mt, bf, name);
+                       if (x != null)
+                               return x;
                }
+                                       
+               return null;
+       }
+#endregion
+       
+}
 
-               return "Item";
+public class MemberCache {
+       public readonly IMemberContainer Container;
+       protected Hashtable MemberHash;
+
+       public MemberCache (IMemberContainer container)
+       {
+               this.Container = container;
+               this.MemberHash = new Hashtable ();
+
+               Timer.IncrementCounter (CounterType.MemberCache);
+               Timer.StartTimer (TimerType.CacheInit);
+
+               AddMembers (true);
+               AddMembers (false);
+
+               Timer.StopTimer (TimerType.CacheInit);
+       }
+
+       void AddMembers (bool declared)
+       {
+               AddMembers (MemberTypes.Constructor, declared);
+               AddMembers (MemberTypes.Event, declared);
+               AddMembers (MemberTypes.Field, declared);
+               AddMembers (MemberTypes.Method, declared);
+               AddMembers (MemberTypes.Property, declared);
+               AddMembers (MemberTypes.NestedType, declared);
+       }
+
+       void AddMembers (MemberTypes mt, bool declared)
+       {
+               AddMembers (mt, BindingFlags.Static | BindingFlags.Public, declared);
+               AddMembers (mt, BindingFlags.Static | BindingFlags.NonPublic, declared);
+               AddMembers (mt, BindingFlags.Instance | BindingFlags.Public, declared);
+               AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, declared);
+       }
+
+       void AddMembers (MemberTypes mt, BindingFlags bf, bool declared)
+       {
+               MemberList members = Container.GetMembers (mt, bf, declared);
+               BindingFlags new_bf = declared ? bf | BindingFlags.DeclaredOnly : bf;
+
+               foreach (MemberInfo member in members) {
+                       string name = member.Name;
+
+                       ArrayList list = (ArrayList) MemberHash [name];
+                       if (list == null) {
+                               list = new ArrayList ();
+                               MemberHash.Add (name, list);
+                       }
+
+                       list.Add (new CacheEntry (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 {
+               public EntryType EntryType;
+               public MemberInfo Member;
+
+               public CacheEntry (MemberInfo member, MemberTypes mt, BindingFlags bf)
+               {
+                       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);
+
+               foreach (CacheEntry entry in applicable) {
+                       if (declared_only && ((entry.EntryType & EntryType.Declared) == 0))
+                               continue;
+
+                       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);
+               }
+       }
+
+       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);
+       }
+}
+
+public class TypeHandle : IMemberContainer {
+       public readonly Type Type;
+       public readonly Type BaseType;
+       public readonly MemberCache MemberCache;
+
+       public TypeHandle (Type t)
+       {
+               this.Type = t;
+               this.BaseType = t.BaseType;
+               this.MemberCache = new MemberCache (this);
+       }
+
+       public MemberList GetMembers (MemberTypes mt, BindingFlags bf, bool declared)
+       {
+               if (declared)
+                       return new MemberList (Type.FindMembers (
+                               mt, bf | BindingFlags.DeclaredOnly, null, null));
+
+               if (BaseType == null)
+                       return MemberList.Empty;
+
+               return new MemberList (BaseType.FindMembers (mt, bf, null, null));
+       }
+
+       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;
+
+               Timer.StartTimer (TimerType.CachedLookup);
+               list = MemberCache.FindMembers (mt, bf, name, filter, criteria);
+               Timer.StopTimer (TimerType.CachedLookup);
+
+               return list;
+       }
 }
 
 }