Delay initialization of missing methods needed by symbol writer
[mono.git] / mcs / mcs / method.cs
index 1ed1913a85b43757d784d7976494230f9ebf63ea..683004a1347f004b091883c8fe6aa2e927f97343 100644 (file)
@@ -15,11 +15,10 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
 using System.Text;
+using System.Linq;
 
 #if NET_2_1
 using XmlElement = System.Object;
@@ -31,9 +30,9 @@ using Mono.CompilerServices.SymbolWriter;
 
 namespace Mono.CSharp {
 
-       public abstract class MethodCore : InterfaceMemberBase
+       public abstract class MethodCore : InterfaceMemberBase, IParametersMember
        {
-               public readonly ParametersCompiled Parameters;
+               protected ParametersCompiled parameters;
                protected ToplevelBlock block;
                protected MethodSpec spec;
 
@@ -42,23 +41,27 @@ namespace Mono.CSharp {
                        MemberName name, Attributes attrs, ParametersCompiled parameters)
                        : base (parent, generic, type, mod, allowed_mod, name, attrs)
                {
-                       Parameters = parameters;
+                       this.parameters = parameters;
                }
 
                //
                //  Returns the System.Type array for the parameters of this method
                //
-               public Type [] ParameterTypes {
+               public TypeSpec [] ParameterTypes {
                        get {
-                               return Parameters.Types;
+                               return parameters.Types;
                        }
                }
 
                public ParametersCompiled ParameterInfo {
                        get {
-                               return Parameters;
+                               return parameters;
                        }
                }
+
+               AParametersCollection IParametersMember.Parameters {
+                       get { return parameters; }
+               }
                
                public ToplevelBlock Block {
                        get {
@@ -72,7 +75,7 @@ namespace Mono.CSharp {
 
                public CallingConventions CallingConventions {
                        get {
-                               CallingConventions cc = Parameters.CallingConvention;
+                               CallingConventions cc = parameters.CallingConvention;
                                if (!IsInterface)
                                        if ((ModFlags & Modifiers.STATIC) == 0)
                                                cc |= CallingConventions.HasThis;
@@ -83,10 +86,25 @@ namespace Mono.CSharp {
                        }
                }
 
+               protected override bool CheckOverrideAgainstBase (MemberSpec base_member)
+               {
+                       bool res = base.CheckOverrideAgainstBase (base_member);
+
+                       //
+                       // Check that the permissions are not being changed
+                       //
+                       if (!CheckAccessModifiers (this, base_member)) {
+                               Error_CannotChangeAccessModifiers (this, base_member);
+                               res = false;
+                       }
+
+                       return res;
+               }
+
                protected override bool CheckBase ()
                {
                        // Check whether arguments were correct.
-                       if (!DefineParameters (Parameters))
+                       if (!DefineParameters (parameters))
                                return false;
 
                        return base.CheckBase ();
@@ -98,7 +116,7 @@ namespace Mono.CSharp {
                //
                public override string GetDocCommentName (DeclSpace ds)
                {
-                       return DocUtil.GetMethodDocCommentName (this, Parameters, ds);
+                       return DocUtil.GetMethodDocCommentName (this, parameters, ds);
                }
 
                //
@@ -123,11 +141,14 @@ namespace Mono.CSharp {
 
                public override bool EnableOverloadChecks (MemberCore overload)
                {
-                       if (overload is MethodCore || overload is AbstractPropertyEventMethod) {
+                       if (overload is MethodCore) {
                                caching_flags |= Flags.MethodOverloadsExist;
                                return true;
                        }
 
+                       if (overload is AbstractPropertyEventMethod)
+                               return true;
+
                        return base.EnableOverloadChecks (overload);
                }
 
@@ -140,102 +161,274 @@ namespace Mono.CSharp {
                        if (!base.VerifyClsCompliance ())
                                return false;
 
-                       if (Parameters.HasArglist) {
+                       if (parameters.HasArglist) {
                                Report.Warning (3000, 1, Location, "Methods with variable arguments are not CLS-compliant");
                        }
 
-                       if (!AttributeTester.IsClsCompliant (MemberType)) {
+                       if (member_type != null && !member_type.IsCLSCompliant ()) {
                                Report.Warning (3002, 1, Location, "Return type of `{0}' is not CLS-compliant",
                                        GetSignatureForError ());
                        }
 
-                       Parameters.VerifyClsCompliance (this);
+                       parameters.VerifyClsCompliance (this);
                        return true;
                }
        }
 
-       interface IGenericMethodDefinition : IMemberDefinition
+       public interface IGenericMethodDefinition : IMemberDefinition
        {
-               MethodInfo MakeGenericMethod (Type[] targs);
+               TypeParameterSpec[] TypeParameters { get; }
+               int TypeParametersCount { get; }
+
+//             MethodInfo MakeGenericMethod (TypeSpec[] targs);
        }
 
-       public class MethodSpec : MemberSpec
+       public class MethodSpec : MemberSpec, IParametersMember
        {
                MethodBase metaInfo;
-               readonly AParametersCollection parameters;
+               AParametersCollection parameters;
+               TypeSpec returnType;
+
+               TypeSpec[] targs;
+               TypeParameterSpec[] constraints;
 
-               public MethodSpec (IMemberDefinition details, MethodBase info, AParametersCollection parameters, Modifiers modifiers)
-                       : base (details, info.Name, modifiers)
+               public MethodSpec (MemberKind kind, TypeSpec declaringType, IMemberDefinition details, TypeSpec returnType,
+                       MethodBase info, AParametersCollection parameters, Modifiers modifiers)
+                       : base (kind, declaringType, details, modifiers)
                {
-                       this.MetaInfo = info;
+                       this.metaInfo = info;
                        this.parameters = parameters;
+                       this.returnType = returnType;
                }
 
-               public override Type DeclaringType {
+               #region Properties
+
+               public override int Arity {
                        get {
-                               return MetaInfo.DeclaringType;
+                               return IsGeneric ? GenericDefinition.TypeParametersCount : 0;
                        }
                }
 
-               public Type[] GetGenericArguments ()
-               {
-                       return MetaInfo.GetGenericArguments ();
-               }
-
-               public MethodSpec Inflate (Type[] targs)
-               {
-                       // TODO: Only create MethodSpec and inflate parameters, defer the call for later
-                       var mb = ((IGenericMethodDefinition) definition).MakeGenericMethod (targs);
+               public TypeParameterSpec[] Constraints {
+                       get {
+                               if (constraints == null && IsGeneric)
+                                       constraints = GenericDefinition.TypeParameters;
 
-                       // TODO: Does not work on .NET
-                       var par = TypeManager.GetParameterData (mb);
+                               return constraints;
+                       }
+               }
 
-                       return new MethodSpec (definition, mb, par, modifiers);
+               public bool IsConstructor {
+                       get {
+                               return Kind == MemberKind.Constructor;
+                       }
                }
 
-               public bool IsAbstract {
+               public IGenericMethodDefinition GenericDefinition {
                        get {
-                               return (modifiers & Modifiers.ABSTRACT) != 0;
+                               return (IGenericMethodDefinition) definition;
                        }
                }
 
-               public bool IsConstructor {
+               public bool IsExtensionMethod {
                        get {
-                               return MetaInfo.IsConstructor;
+                               return IsStatic && parameters.HasExtensionMethodType;
                        }
                }
 
-               public bool IsGenericMethod {
+               public bool IsSealed {
                        get {
-                               return MetaInfo.IsGenericMethod;
+                               return (Modifiers & Modifiers.SEALED) != 0;
                        }
                }
 
                // When is virtual or abstract
                public bool IsVirtual {
                        get {
-                               return (modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) != 0;
+                               return (Modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) != 0;
                        }
                }
 
-               public MethodBase MetaInfo {
+               public bool IsReservedMethod {
                        get {
-                               return metaInfo;
+                               return Kind == MemberKind.Operator || IsAccessor;
                        }
-                       set {
-                               metaInfo = value;
+               }
+
+               TypeSpec IInterfaceMemberSpec.MemberType {
+                       get {
+                               return returnType;
                        }
                }
 
                public AParametersCollection Parameters {
-                       get { return parameters; }
+                       get { 
+                               return parameters;
+                       }
+               }
+
+               public TypeSpec ReturnType {
+                       get {
+                               return returnType;
+                       }
                }
 
-               public Type ReturnType {
+               public TypeSpec[] TypeArguments {
                        get {
-                               return IsConstructor ?
-                                       TypeManager.void_type : ((MethodInfo) MetaInfo).ReturnType;
+                               return targs;
+                       }
+               }
+
+               #endregion
+
+               public MethodSpec GetGenericMethodDefinition ()
+               {
+                       if (!IsGeneric && !DeclaringType.IsGeneric)
+                               return this;
+
+                       return MemberCache.GetMember (declaringType, this);
+               }
+
+               public MethodBase GetMetaInfo ()
+               {
+                       if ((state & StateFlags.PendingMetaInflate) != 0) {
+                               if (DeclaringType.IsTypeBuilder) {
+                                       if (IsConstructor)
+                                               metaInfo = TypeBuilder.GetConstructor (DeclaringType.GetMetaInfo (), (ConstructorInfo) metaInfo);
+                                       else
+                                               metaInfo = TypeBuilder.GetMethod (DeclaringType.GetMetaInfo (), (MethodInfo) metaInfo);
+                               } else {
+                                       metaInfo = MethodInfo.GetMethodFromHandle (metaInfo.MethodHandle, DeclaringType.GetMetaInfo ().TypeHandle);
+                               }
+
+                               state &= ~StateFlags.PendingMetaInflate;
+                       }
+
+                       if ((state & StateFlags.PendingMakeMethod) != 0) {
+                               var sre_targs = new Type[targs.Length];
+                               for (int i = 0; i < sre_targs.Length; ++i)
+                                       sre_targs[i] = targs[i].GetMetaInfo ();
+
+                               metaInfo = ((MethodInfo) metaInfo).MakeGenericMethod (sre_targs);
+                               state &= ~StateFlags.PendingMakeMethod;
                        }
+
+                       return metaInfo;
+               }
+
+               public override string GetSignatureForError ()
+               {
+                       string name;
+                       if (IsConstructor) {
+                               name = DeclaringType.GetSignatureForError () + "." + DeclaringType.Name;
+                       } else if (Kind == MemberKind.Operator) {
+                               var op = Operator.GetType (Name).Value;
+                               if (op == Operator.OpType.Implicit || op == Operator.OpType.Explicit) {
+                                       name = DeclaringType.GetSignatureForError () + "." + Operator.GetName (op) + " operator " + returnType.GetSignatureForError ();
+                               } else {
+                                       name = DeclaringType.GetSignatureForError () + ".operator " + Operator.GetName (op);
+                               }
+                       } else if (IsAccessor) {
+                               int split = Name.IndexOf ('_');
+                               name = Name.Substring (split + 1);
+                               var postfix = Name.Substring (0, split);
+                               if (split == 3) {
+                                       var pc = parameters.Count;
+                                       if (pc > 0 && postfix == "get") {
+                                               name = "this" + parameters.GetSignatureForError ("[", "]", pc);
+                                       } else if (pc > 1 && postfix == "set") {
+                                               name = "this" + parameters.GetSignatureForError ("[", "]", pc - 1);
+                                       }
+                               }
+
+                               return DeclaringType.GetSignatureForError () + "." + name + "." + postfix;
+                       } else {
+                               name = base.GetSignatureForError ();
+                               if (targs != null)
+                                       name += "<" + TypeManager.CSharpName (targs) + ">";
+                               else if (IsGeneric)
+                                       name += "<" + TypeManager.CSharpName (GenericDefinition.TypeParameters) + ">";
+                       }
+
+                       return name + parameters.GetSignatureForError ();
+               }
+
+               public override MemberSpec InflateMember (TypeParameterInflator inflator)
+               {
+                       var ms = (MethodSpec) base.InflateMember (inflator);
+                       ms.returnType = inflator.Inflate (returnType);
+                       ms.parameters = parameters.Inflate (inflator);
+                       if (IsGeneric)
+                               ms.constraints = TypeParameterSpec.InflateConstraints (inflator, Constraints);
+
+                       return ms;
+               }
+
+               public MethodSpec MakeGenericMethod (params TypeSpec[] targs)
+               {
+                       if (targs == null)
+                               throw new ArgumentNullException ();
+// TODO MemberCache
+//                     if (generic_intances != null && generic_intances.TryGetValue (targs, out ginstance))
+//                             return ginstance;
+
+                       //if (generic_intances == null)
+                       //    generic_intances = new Dictionary<TypeSpec[], Method> (TypeSpecArrayComparer.Default);
+
+                       var inflator = new TypeParameterInflator (DeclaringType, GenericDefinition.TypeParameters, targs);
+
+                       var inflated = (MethodSpec) MemberwiseClone ();
+                       inflated.declaringType = inflator.TypeInstance;
+                       inflated.returnType = inflator.Inflate (returnType);
+                       inflated.parameters = parameters.Inflate (inflator);
+                       inflated.targs = targs;
+                       inflated.constraints = TypeParameterSpec.InflateConstraints (inflator, constraints ?? GenericDefinition.TypeParameters);
+                       inflated.state |= StateFlags.PendingMakeMethod;
+
+                       //                      if (inflated.parent == null)
+                       //                              inflated.parent = parent;
+
+                       //generic_intances.Add (targs, inflated);
+                       return inflated;
+               }
+
+               public MethodSpec Mutate (TypeParameterMutator mutator)
+               {
+                       var targs = TypeArguments;
+                       if (targs != null)
+                               targs = mutator.Mutate (targs);
+
+                       var decl = DeclaringType;
+                       if (DeclaringType.IsGenericOrParentIsGeneric) {
+                               decl = mutator.Mutate (decl);
+                       }
+
+                       if (targs == TypeArguments && decl == DeclaringType)
+                               return this;
+
+                       var ms = (MethodSpec) MemberwiseClone ();
+                       if (decl != DeclaringType) {
+                               // Gets back MethodInfo in case of metaInfo was inflated
+                               ms.metaInfo = MemberCache.GetMember (TypeParameterMutator.GetMemberDeclaringType (DeclaringType), this).metaInfo;
+
+                               ms.declaringType = decl;
+                               ms.state |= StateFlags.PendingMetaInflate;
+                       }
+
+                       if (targs != null) {
+                               ms.targs = targs;
+                               ms.state |= StateFlags.PendingMakeMethod;
+                       }
+
+                       return ms;
+               }
+
+               public void SetMetaInfo (MethodInfo info)
+               {
+                       if (this.metaInfo != null)
+                               throw new InternalErrorException ("MetaInfo reset");
+
+                       this.metaInfo = info;
                }
        }
 
@@ -256,18 +449,18 @@ namespace Mono.CSharp {
                {
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Target == AttributeTargets.ReturnValue) {
                                if (return_attributes == null)
                                        return_attributes = new ReturnParameter (this, MethodBuilder, Location);
 
-                               return_attributes.ApplyAttributeBuilder (a, cb, pa);
+                               return_attributes.ApplyAttributeBuilder (a, ctor, cdata, pa);
                                return;
                        }
 
-                       if (a.IsInternalMethodImplAttribute) {
-                               is_external_implementation = true;
+                       if (a.Type == pa.MethodImpl) {
+                               is_external_implementation = a.IsInternalCall ();
                        }
 
                        if (a.Type == pa.DllImport) {
@@ -286,7 +479,7 @@ namespace Mono.CSharp {
                        }
 
                        if (MethodBuilder != null)
-                               MethodBuilder.SetCustomAttribute (cb);
+                               MethodBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), cdata);
                }
 
                public override AttributeTargets AttributeTargets {
@@ -297,28 +490,12 @@ namespace Mono.CSharp {
 
                protected override bool CheckForDuplications ()
                {
-                       string name = GetFullName (MemberName);
-                       if (MemberName.IsGeneric)
-                               name = MemberName.MakeName (name, MemberName.TypeArguments);
-
-                       return Parent.MemberCache.CheckExistingMembersOverloads (this, name, Parameters, Report);
+                       return Parent.MemberCache.CheckExistingMembersOverloads (this, parameters);
                }
 
                public virtual EmitContext CreateEmitContext (ILGenerator ig)
                {
-                       return new EmitContext (
-                               this, ig, MemberType);
-               }
-
-               protected override bool ResolveMemberType ()
-               {
-                       if (GenericMethod != null) {
-                               MethodBuilder = Parent.TypeBuilder.DefineMethod (GetFullName (MemberName), flags);
-                               if (!GenericMethod.Define (this))
-                                       return false;
-                       }
-
-                       return base.ResolveMemberType ();
+                       return new EmitContext (this, ig, MemberType);
                }
 
                public override bool Define ()
@@ -329,14 +506,13 @@ namespace Mono.CSharp {
                        if (!CheckBase ())
                                return false;
 
-                       if (block != null && block.IsIterator && !(Parent is IteratorStorey)) {
-                               //
-                               // Current method is turned into automatically generated
-                               // wrapper which creates an instance of iterator
-                               //
-                               Iterator.CreateIterator (this, Parent.PartialContainer, ModFlags, Compiler);
-                               ModFlags |= Modifiers.DEBUGGER_HIDDEN;
-                       }
+                       MemberKind kind;
+                       if (this is Operator)
+                               kind = MemberKind.Operator;
+                       else if (this is Destructor)
+                               kind = MemberKind.Destructor;
+                       else
+                               kind = MemberKind.Method;
 
                        if (IsPartialDefinition) {
                                caching_flags &= ~Flags.Excluded_Undetected;
@@ -344,11 +520,10 @@ namespace Mono.CSharp {
 
                                // Add to member cache only when a partial method implementation has not been found yet
                                if ((caching_flags & Flags.PartialDefinitionExists) == 0) {
-                                       MethodBase mb = new PartialMethodDefinitionInfo (this);
-                                       Parent.MemberCache.AddMember (mb, this);
-                                       TypeManager.AddMethod (mb, this);
+//                                     MethodBase mb = new PartialMethodDefinitionInfo (this);
 
-                                       spec = new MethodSpec (this, mb, Parameters, ModFlags);
+                                       spec = new MethodSpec (kind, Parent.Definition, this, ReturnType, null, parameters, ModFlags);
+                                       Parent.MemberCache.AddMember (spec);
                                }
 
                                return true;
@@ -362,12 +537,11 @@ namespace Mono.CSharp {
                                        
                        MethodBuilder = MethodData.MethodBuilder;
 
-                       spec = new MethodSpec (this, MethodBuilder, Parameters, ModFlags);
-
-                       if (TypeManager.IsGenericMethod (MethodBuilder))
-                               Parent.MemberCache.AddGenericMember (MethodBuilder, this);
+                       spec = new MethodSpec (kind, Parent.Definition, this, ReturnType, MethodBuilder, parameters, ModFlags);
+                       if (MemberName.Arity > 0)
+                               spec.IsGeneric = true;
                        
-                       Parent.MemberCache.AddMember (MethodBuilder, this);
+                       Parent.MemberCache.AddMember (this, MethodBuilder.Name, spec);
 
                        return true;
                }
@@ -379,8 +553,8 @@ namespace Mono.CSharp {
                        CheckAbstractAndExtern (block != null);
 
                        if ((ModFlags & Modifiers.PARTIAL) != 0) {
-                               for (int i = 0; i < Parameters.Count; ++i) {
-                                       IParameterData p = Parameters.FixedParameters [i];
+                               for (int i = 0; i < parameters.Count; ++i) {
+                                       IParameterData p = parameters.FixedParameters [i];
                                        if (p.ModFlags == Parameter.Modifier.OUT) {
                                                Report.Error (752, Location, "`{0}': A partial method parameters cannot use `out' modifier",
                                                        GetSignatureForError ());
@@ -396,33 +570,24 @@ namespace Mono.CSharp {
                {
                        base.DoMemberTypeDependentChecks ();
 
-                       if (!TypeManager.IsGenericParameter (MemberType)) {
-                               if (MemberType.IsAbstract && MemberType.IsSealed) {
-                                       Report.Error (722, Location, Error722, TypeManager.CSharpName (MemberType));
-                               }
+                       if (MemberType.IsStatic) {
+                               Error_StaticReturnType ();
                        }
                }
 
                public override void Emit ()
                {
                        if ((ModFlags & Modifiers.COMPILER_GENERATED) != 0 && !Parent.IsCompilerGenerated)
-                               PredefinedAttributes.Get.CompilerGenerated.EmitAttribute (MethodBuilder);
+                               Module.PredefinedAttributes.CompilerGenerated.EmitAttribute (MethodBuilder);
                        if ((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0)
-                               PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (MethodBuilder);
+                               Module.PredefinedAttributes.DebuggerHidden.EmitAttribute (MethodBuilder);
 
-                       if (TypeManager.IsDynamicType (ReturnType)) {
+                       if (ReturnType == InternalType.Dynamic) {
                                return_attributes = new ReturnParameter (this, MethodBuilder, Location);
-                               PredefinedAttributes.Get.Dynamic.EmitAttribute (return_attributes.Builder);
-                       } else {
-                               var trans_flags = TypeManager.HasDynamicTypeUsed (ReturnType);
-                               if (trans_flags != null) {
-                                       var pa = PredefinedAttributes.Get.DynamicTransform;
-                                       if (pa.Constructor != null || pa.ResolveConstructor (Location, TypeManager.bool_type.MakeArrayType ())) {
-                                               return_attributes = new ReturnParameter (this, MethodBuilder, Location);
-                                               return_attributes.Builder.SetCustomAttribute (
-                                                       new CustomAttributeBuilder (pa.Constructor, new object [] { trans_flags }));
-                                       }
-                               }
+                               Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder);
+                       } else if (ReturnType.HasDynamicElement) {
+                               return_attributes = new ReturnParameter (this, MethodBuilder, Location);
+                               Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder, ReturnType, Location);
                        }
 
                        if (OptAttributes != null)
@@ -470,7 +635,7 @@ namespace Mono.CSharp {
 
                #region IMethodData Members
 
-               public Type ReturnType {
+               public TypeSpec ReturnType {
                        get {
                                return MemberType;
                        }
@@ -485,48 +650,36 @@ namespace Mono.CSharp {
                /// <summary>
                /// Returns true if method has conditional attribute and the conditions is not defined (method is excluded).
                /// </summary>
-               public bool IsExcluded () {
-                       if ((caching_flags & Flags.Excluded_Undetected) == 0)
-                               return (caching_flags & Flags.Excluded) != 0;
+               public override string[] ConditionalConditions ()
+               {
+                       if ((caching_flags & (Flags.Excluded_Undetected | Flags.Excluded)) == 0)
+                               return null;
+
+                       if ((ModFlags & Modifiers.PARTIAL) != 0 && (caching_flags & Flags.Excluded) != 0)
+                               return new string [0];
 
                        caching_flags &= ~Flags.Excluded_Undetected;
+                       string[] conditions;
 
                        if (base_method == null) {
                                if (OptAttributes == null)
-                                       return false;
-
-                               Attribute[] attrs = OptAttributes.SearchMulti (PredefinedAttributes.Get.Conditional);
+                                       return null;
 
+                               Attribute[] attrs = OptAttributes.SearchMulti (Module.PredefinedAttributes.Conditional);
                                if (attrs == null)
-                                       return false;
-
-                               foreach (Attribute a in attrs) {
-                                       string condition = a.GetConditionalAttributeValue ();
-                                       if (condition == null)
-                                               return false;
-
-                                       if (Location.CompilationUnit.IsConditionalDefined (condition))
-                                               return false;
-                               }
-
-                               caching_flags |= Flags.Excluded;
-                               return true;
-                       }
+                                       return null;
 
-                       IMethodData md = TypeManager.GetMethod (TypeManager.DropGenericMethodArguments (base_method));
-                       if (md == null) {
-                               if (AttributeTester.IsConditionalMethodExcluded (base_method, Location)) {
-                                       caching_flags |= Flags.Excluded;
-                                       return true;
-                               }
-                               return false;
+                               conditions = new string[attrs.Length];
+                               for (int i = 0; i < conditions.Length; ++i)
+                                       conditions[i] = attrs[i].GetConditionalAttributeValue ();
+                       } else {
+                               conditions = base_method.MemberDefinition.ConditionalConditions();
                        }
 
-                       if (md.IsExcluded ()) {
+                       if (conditions != null)
                                caching_flags |= Flags.Excluded;
-                               return true;
-                       }
-                       return false;
+
+                       return conditions;
                }
 
                GenericMethod IMethodData.GenericMethod {
@@ -601,33 +754,15 @@ namespace Mono.CSharp {
 
        public class Method : MethodOrOperator, IGenericMethodDefinition
        {
-               /// <summary>
-               ///   Modifiers allowed in a class declaration
-               /// </summary>
-               const Modifiers AllowedModifiers =
-                       Modifiers.NEW |
-                       Modifiers.PUBLIC |
-                       Modifiers.PROTECTED |
-                       Modifiers.INTERNAL |
-                       Modifiers.PRIVATE |
-                       Modifiers.STATIC |
-                       Modifiers.VIRTUAL |
-                       Modifiers.SEALED |
-                       Modifiers.OVERRIDE |
-                       Modifiers.ABSTRACT |
-                       Modifiers.UNSAFE |
-                       Modifiers.EXTERN;
-
-               const Modifiers AllowedInterfaceModifiers = 
-                       Modifiers.NEW | Modifiers.UNSAFE;
-
                Method partialMethodImplementation;
 
                public Method (DeclSpace parent, GenericMethod generic,
                               FullNamedExpression return_type, Modifiers mod,
                               MemberName name, ParametersCompiled parameters, Attributes attrs)
                        : base (parent, generic, return_type, mod,
-                               parent.PartialContainer.Kind == Kind.Interface ? AllowedInterfaceModifiers : AllowedModifiers,
+                               parent.PartialContainer.Kind == MemberKind.Interface ? AllowedModifiersInterface :
+                               parent.PartialContainer.Kind == MemberKind.Struct ? AllowedModifiersStruct :
+                               AllowedModifiersClass,
                                name, attrs, parameters)
                {
                }
@@ -637,17 +772,60 @@ namespace Mono.CSharp {
                        : base (parent, null, return_type, mod, amod, name, attrs, parameters)
                {
                }
-               
+
+               #region Properties
+
+               public override TypeParameter[] CurrentTypeParameters {
+                       get {
+                               if (GenericMethod != null)
+                                       return GenericMethod.CurrentTypeParameters;
+
+                               return null;
+                       }
+               }
+
+               public override bool HasUnresolvedConstraints {
+                       get {
+                               if (CurrentTypeParameters == null)
+                                       return false;
+
+                               // When overriding base method constraints are fetched from
+                               // base method but to find it we have to resolve parameters
+                               // to find exact base method match
+                               if (IsExplicitImpl || (ModFlags & Modifiers.OVERRIDE) != 0)
+                                       return base_method == null;
+
+                               // Even for non-override generic method constraints check has to be
+                               // delayed after all constraints are resolved
+                               return true;
+                       }
+               }
+
+               public TypeParameterSpec[] TypeParameters {
+                       get {
+                               // TODO: Cache this
+                               return CurrentTypeParameters.Select (l => l.Type).ToArray ();
+                       }
+               }
+
+               public int TypeParametersCount {
+                       get {
+                               return CurrentTypeParameters == null ? 0 : CurrentTypeParameters.Length;
+                       }
+               }
+
+#endregion
+
                public override string GetSignatureForError()
                {
-                       return base.GetSignatureForError () + Parameters.GetSignatureForError ();
+                       return base.GetSignatureForError () + parameters.GetSignatureForError ();
                }
 
                void Error_DuplicateEntryPoint (Method b)
                {
                        Report.Error (17, b.Location,
                                "Program `{0}' has more than one entry point defined: `{1}'",
-                               CodeGen.FileName, b.GetSignatureForError ());
+                               b.Module.Builder.ScopeName, b.GetSignatureForError ());
                }
 
                bool IsEntryPoint ()
@@ -656,31 +834,32 @@ namespace Mono.CSharp {
                                ReturnType != TypeManager.int32_type)
                                return false;
 
-                       if (Parameters.Count == 0)
+                       if (parameters.IsEmpty)
                                return true;
 
-                       if (Parameters.Count > 1)
+                       if (parameters.Count > 1)
                                return false;
 
-                       Type t = Parameters.Types [0];
-                       return t.IsArray && t.GetArrayRank () == 1 &&
-                                       TypeManager.GetElementType (t) == TypeManager.string_type &&
-                                       (Parameters[0].ModFlags & ~Parameter.Modifier.PARAMS) == Parameter.Modifier.NONE;
+                       var ac = parameters.Types [0] as ArrayContainer;
+                       return ac != null && ac.Rank == 1 && ac.Element == TypeManager.string_type &&
+                                       (parameters[0].ModFlags & ~Parameter.Modifier.PARAMS) == Parameter.Modifier.NONE;
                }
 
-               public override FullNamedExpression LookupNamespaceOrType (string name, Location loc, bool ignore_cs0104)
+               public override FullNamedExpression LookupNamespaceOrType (string name, int arity, Location loc, bool ignore_cs0104)
                {
-                       TypeParameter[] tp = CurrentTypeParameters;
-                       if (tp != null) {
-                               TypeParameter t = TypeParameter.FindTypeParameter (tp, name);
-                               if (t != null)
-                                       return new TypeParameterExpr (t, loc);
+                       if (arity == 0) {
+                               TypeParameter[] tp = CurrentTypeParameters;
+                               if (tp != null) {
+                                       TypeParameter t = TypeParameter.FindTypeParameter (tp, name);
+                                       if (t != null)
+                                               return new TypeParameterExpr (t, loc);
+                               }
                        }
 
-                       return base.LookupNamespaceOrType (name, loc, ignore_cs0104);
+                       return base.LookupNamespaceOrType (name, arity, loc, ignore_cs0104);
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Type == pa.Conditional) {
                                if (IsExplicitImpl) {
@@ -688,13 +867,13 @@ namespace Mono.CSharp {
                                        return;
                                }
 
-                               if (ReturnType != TypeManager.void_type) {
-                                       Report.Error (578, Location, "Conditional not valid on `{0}' because its return type is not void", GetSignatureForError ());
+                               if ((ModFlags & Modifiers.OVERRIDE) != 0) {
+                                       Report.Error (243, Location, "Conditional not valid on `{0}' because it is an override method", GetSignatureForError ());
                                        return;
                                }
 
-                               if ((ModFlags & Modifiers.OVERRIDE) != 0) {
-                                       Report.Error (243, Location, "Conditional not valid on `{0}' because it is an override method", GetSignatureForError ());
+                               if (ReturnType != TypeManager.void_type) {
+                                       Report.Error (578, Location, "Conditional not valid on `{0}' because its return type is not void", GetSignatureForError ());
                                        return;
                                }
 
@@ -710,8 +889,8 @@ namespace Mono.CSharp {
                                        return;
                                }
 
-                               for (int i = 0; i < Parameters.Count; ++i) {
-                                       if (Parameters.FixedParameters [i].ModFlags == Parameter.Modifier.OUT) {
+                               for (int i = 0; i < parameters.Count; ++i) {
+                                       if (parameters.FixedParameters [i].ModFlags == Parameter.Modifier.OUT) {
                                                Report.Error (685, Location, "Conditional method `{0}' cannot have an out parameter", GetSignatureForError ());
                                                return;
                                        }
@@ -723,54 +902,99 @@ namespace Mono.CSharp {
                                return;
                        }
 
-                       base.ApplyAttributeBuilder (a, cb, pa);
+                       base.ApplyAttributeBuilder (a, ctor, cdata, pa);
                }
 
-               protected override bool CheckForDuplications ()
-               {
-                       if (!base.CheckForDuplications ())
-                               return false;
+               protected virtual void DefineTypeParameters ()
+               {
+                       var tparams = CurrentTypeParameters;
 
-                       var ar = Parent.PartialContainer.Properties;
-                       if (ar != null) {
-                               for (int i = 0; i < ar.Count; ++i) {
-                                       PropertyBase pb = (PropertyBase) ar [i];
-                                       if (pb.AreAccessorsDuplicateImplementation (this))
-                                               return false;
-                               }
-                       }
+                       TypeParameterSpec[] base_tparams = null;
+                       TypeParameterSpec[] base_decl_tparams = TypeParameterSpec.EmptyTypes;
+                       TypeSpec[] base_targs = TypeSpec.EmptyTypes;
+                       if (((ModFlags & Modifiers.OVERRIDE) != 0 || IsExplicitImpl)) {
+                               if (base_method != null) {
+                                       base_tparams = base_method.GenericDefinition.TypeParameters;
+                               
+                                       if (base_method.DeclaringType.IsGeneric) {
+                                               base_decl_tparams = base_method.DeclaringType.MemberDefinition.TypeParameters;
+                                               base_targs = Parent.BaseType.TypeArguments;
+                                       }
 
-                       ar = Parent.PartialContainer.Indexers;
-                       if (ar != null) {
-                               for (int i = 0; i < ar.Count; ++i) {
-                                       PropertyBase pb = (PropertyBase) ar [i];
-                                       if (pb.AreAccessorsDuplicateImplementation (this))
-                                               return false;
+                                       if (base_method.IsGeneric) {
+                                               if (base_decl_tparams.Length != 0) {
+                                                       base_decl_tparams = base_decl_tparams.Concat (base_tparams).ToArray ();
+                                                       base_targs = base_targs.Concat (tparams.Select<TypeParameter, TypeSpec> (l => l.Type)).ToArray ();
+                                               } else {
+                                                       base_decl_tparams = base_tparams;
+                                                       base_targs = tparams.Select (l => l.Type).ToArray ();
+                                               }
+                                       }
+                               } else if (MethodData.implementing != null) {
+                                       base_tparams = MethodData.implementing.GenericDefinition.TypeParameters;
+                                       if (MethodData.implementing.DeclaringType.IsGeneric) {
+                                               base_decl_tparams = MethodData.implementing.DeclaringType.MemberDefinition.TypeParameters;
+                                               foreach (var iface in Parent.CurrentType.Interfaces) {
+                                                       if (iface == MethodData.implementing.DeclaringType) {
+                                                               base_targs = iface.TypeArguments;
+                                                               break;
+                                                       }
+                                               }
+                                       }
                                }
                        }
 
-                       return true;
-               }
+                       for (int i = 0; i < tparams.Length; ++i) {
+                               var tp = tparams[i];
 
-               protected override bool CheckBase ()
-               {
-                       if (!base.CheckBase ())
-                               return false;
+                               if (!tp.ResolveConstraints (this))
+                                       continue;
 
-                       if (base_method != null && (ModFlags & Modifiers.OVERRIDE) != 0 && Name == Destructor.MetadataName) {
-                               Report.Error (249, Location, "Do not override `{0}'. Use destructor syntax instead",
-                                       TypeManager.CSharpSignature (base_method));
-                       }
+                               //
+                               // Copy base constraints for override/explicit methods
+                               //
+                               if (base_tparams != null) {
+                                       var base_tparam = base_tparams[i];
+                                       var local_tparam = tp.Type;
+                                       local_tparam.SpecialConstraint = base_tparam.SpecialConstraint;
 
-                       return true;
-               }
+                                       var inflator = new TypeParameterInflator (CurrentType, base_decl_tparams, base_targs);
+                                       base_tparam.InflateConstraints (inflator, local_tparam);
 
-               public override TypeParameter[] CurrentTypeParameters {
-                       get {
-                               if (GenericMethod != null)
-                                       return GenericMethod.CurrentTypeParameters;
+                                       //
+                                       // Check all type argument constraints for possible collision
+                                       // introduced by inflating inherited constraints in this context
+                                       //
+                                       // Conflict example:
+                                       //
+                                       // class A<T> { virtual void Foo<U> () where U : class, T {} }
+                                       // class B : A<int> { override void Foo<U> {} }
+                                       //
+                                       var local_tparam_targs = local_tparam.TypeArguments;
+                                       if (local_tparam_targs != null) {                                       
+                                               for (int ii = 0; ii < local_tparam_targs.Length; ++ii) {
+                                                       var ta = local_tparam_targs [ii];
+                                                       if (!ta.IsClass && !ta.IsStruct)
+                                                               continue;
+
+                                                       if (Constraints.CheckConflictingInheritedConstraint (local_tparam, ta, this, Location)) {
+                                                               local_tparam.ChangeTypeArgumentToBaseType (ii);
+                                                       }
+                                               }
+                                       }
 
-                               return null;
+                                       continue;
+                               }
+                               
+                               if (MethodData.implementing != null) {
+                                       var base_tp = MethodData.implementing.Constraints[i];
+                                       if (!tp.Type.HasSameConstraintsImplementation (base_tp)) {
+                                               Report.SymbolRelatedToPreviousError (MethodData.implementing);
+                                               Report.Error (425, Location,
+                                                       "The constraints for type parameter `{0}' of method `{1}' must match the constraints for type parameter `{2}' of interface method `{3}'. Consider using an explicit interface implementation instead",
+                                                       tp.GetSignatureForError (), GetSignatureForError (), base_tp.GetSignatureForError (), MethodData.implementing.GetSignatureForError ());
+                                       }
+                               }
                        }
                }
 
@@ -779,7 +1003,7 @@ namespace Mono.CSharp {
                //
                public override bool Define ()
                {
-                       if (type_name == TypeManager.system_void_expr && Parameters.IsEmpty && Name == Destructor.MetadataName) {
+                       if (type_expr.Type == TypeManager.void_type && parameters.IsEmpty && MemberName.Arity == 0 && MemberName.Name == Destructor.MetadataName) {
                                Report.Warning (465, 1, Location, "Introducing `Finalize' method can interfere with destructor invocation. Did you intend to declare a destructor?");
                        }
 
@@ -794,23 +1018,37 @@ namespace Mono.CSharp {
                                return false;
                        }
 
-                       if (base_method != null && (ModFlags & Modifiers.NEW) == 0) {
-                               if (Parameters.Count == 1 && ParameterTypes [0] == TypeManager.object_type && Name == "Equals")
-                                       Parent.PartialContainer.Mark_HasEquals ();
-                               else if (Parameters.IsEmpty && Name == "GetHashCode")
-                                       Parent.PartialContainer.Mark_HasGetHashCode ();
+                       if (CurrentTypeParameters == null) {
+                               if (base_method != null) {
+                                       if (parameters.Count == 1 && ParameterTypes[0] == TypeManager.object_type && Name == "Equals")
+                                               Parent.PartialContainer.Mark_HasEquals ();
+                                       else if (parameters.IsEmpty && Name == "GetHashCode")
+                                               Parent.PartialContainer.Mark_HasGetHashCode ();
+                               }
+                                       
+                       } else {
+                               DefineTypeParameters ();
+                       }
+
+                       if (block != null && block.IsIterator) {
+                               //
+                               // Current method is turned into automatically generated
+                               // wrapper which creates an instance of iterator
+                               //
+                               Iterator.CreateIterator (this, Parent.PartialContainer, ModFlags, Compiler);
+                               ModFlags |= Modifiers.DEBUGGER_HIDDEN;
                        }
 
                        if ((ModFlags & Modifiers.STATIC) == 0)
                                return true;
 
-                       if (Parameters.HasExtensionMethodType) {
-                               if (Parent.PartialContainer.IsStaticClass && !Parent.IsGeneric) {
+                       if (parameters.HasExtensionMethodType) {
+                               if (Parent.PartialContainer.IsStatic && !Parent.IsGeneric) {
                                        if (!Parent.IsTopLevel)
                                                Report.Error (1109, Location, "`{0}': Extension methods cannot be defined in a nested class",
                                                        GetSignatureForError ());
 
-                                       PredefinedAttribute pa = PredefinedAttributes.Get.Extension;
+                                       PredefinedAttribute pa = Module.PredefinedAttributes.Extension;
                                        if (!pa.IsDefined) {
                                                Report.Error (1110, Location,
                                                        "`{0}': Extension methods cannot be declared without a reference to System.Core.dll assembly. Add the assembly reference or remove `this' modifer from the first parameter",
@@ -819,7 +1057,8 @@ namespace Mono.CSharp {
 
                                        ModFlags |= Modifiers.METHOD_EXTENSION;
                                        Parent.PartialContainer.ModFlags |= Modifiers.METHOD_EXTENSION;
-                                       CodeGen.Assembly.HasExtensionMethods = true;
+                                       Spec.DeclaringType.SetExtensionMethodContainer ();
+                                       Parent.Module.HasExtensionMethod = true;
                                } else {
                                        Report.Error (1106, Location, "`{0}': Extension methods must be defined in a non-generic static class",
                                                GetSignatureForError ());
@@ -835,16 +1074,16 @@ namespace Mono.CSharp {
                                RootContext.MainClass == Parent.TypeBuilder.FullName)){
                                if (IsEntryPoint ()) {
 
-                                       if (RootContext.EntryPoint == null) {
+                                       if (Parent.DeclaringAssembly.EntryPoint == null) {
                                                if (Parent.IsGeneric || MemberName.IsGeneric) {
                                                        Report.Warning (402, 4, Location, "`{0}': an entry point cannot be generic or in a generic type",
                                                                GetSignatureForError ());
                                                } else {
                                                        SetIsUsed ();
-                                                       RootContext.EntryPoint = this;
+                                                       Parent.DeclaringAssembly.EntryPoint = this;
                                                }
                                        } else {
-                                               Error_DuplicateEntryPoint (RootContext.EntryPoint);
+                                               Error_DuplicateEntryPoint (Parent.DeclaringAssembly.EntryPoint);
                                                Error_DuplicateEntryPoint (this);
                                        }
                                } else {
@@ -862,24 +1101,44 @@ namespace Mono.CSharp {
                public override void Emit ()
                {
                        try {
-                               Report.Debug (64, "METHOD EMIT", this, MethodBuilder, Location, Block, MethodData);
                                if (IsPartialDefinition) {
                                        //
                                        // Use partial method implementation builder for partial method declaration attributes
                                        //
                                        if (partialMethodImplementation != null) {
                                                MethodBuilder = partialMethodImplementation.MethodBuilder;
-                                               return;
                                        }
-                               } else if ((ModFlags & Modifiers.PARTIAL) != 0 && (caching_flags & Flags.PartialDefinitionExists) == 0) {
+
+                                       return;
+                               }
+                               
+                               if ((ModFlags & Modifiers.PARTIAL) != 0 && (caching_flags & Flags.PartialDefinitionExists) == 0) {
                                        Report.Error (759, Location, "A partial method `{0}' implementation is missing a partial method declaration",
                                                GetSignatureForError ());
                                }
 
+                               if (CurrentTypeParameters != null) {
+                                       var ge = type_expr as GenericTypeExpr;
+                                       if (ge != null)
+                                               ge.CheckConstraints (this);
+
+                                       foreach (Parameter p in parameters.FixedParameters) {
+                                               ge = p.TypeExpression as GenericTypeExpr;
+                                               if (ge != null)
+                                                       ge.CheckConstraints (this);
+                                       }
+
+                                       for (int i = 0; i < CurrentTypeParameters.Length; ++i) {
+                                               var tp = CurrentTypeParameters [i];
+                                               tp.CheckGenericConstraints ();
+                                               tp.Emit ();
+                                       }
+                               }
+
                                base.Emit ();
                                
                                if ((ModFlags & Modifiers.METHOD_EXTENSION) != 0)
-                                       PredefinedAttributes.Get.Extension.EmitAttribute (MethodBuilder);
+                                       Module.PredefinedAttributes.Extension.EmitAttribute (MethodBuilder);
                        } catch {
                                Console.WriteLine ("Internal compiler error at {0}: exception caught while emitting {1}",
                                                   Location, MethodBuilder);
@@ -899,29 +1158,20 @@ namespace Mono.CSharp {
                        return base.EnableOverloadChecks (overload);
                }
 
-               public static void Error1599 (Location loc, Type t, Report Report)
+               public static void Error1599 (Location loc, TypeSpec t, Report Report)
                {
                        Report.Error (1599, loc, "Method or delegate cannot return type `{0}'", TypeManager.CSharpName (t));
                }
 
-               protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+               protected override bool ResolveMemberType ()
                {
-                       MethodInfo mi = (MethodInfo) Parent.PartialContainer.BaseCache.FindMemberToOverride (
-                               Parent.TypeBuilder, Name, Parameters, GenericMethod, false);
-
-                       if (mi == null)
-                               return null;
-
-                       if (mi.IsSpecialName)
-                               return null;
-
-                       base_ret_type = TypeManager.TypeToCoreType (mi.ReturnType);
-                       return mi;
-               }
+                       if (GenericMethod != null) {
+                               MethodBuilder = Parent.TypeBuilder.DefineMethod (GetFullName (MemberName), flags);
+                               if (!GenericMethod.Define (this))
+                                       return false;
+                       }
 
-               public MethodInfo MakeGenericMethod (Type[] targs)
-               {
-                       return MethodBuilder.MakeGenericMethod (targs);
+                       return base.ResolveMemberType ();
                }
 
                public void SetPartialDefinition (Method methodDefinition)
@@ -930,9 +1180,9 @@ namespace Mono.CSharp {
                        methodDefinition.partialMethodImplementation = this;
 
                        // Ensure we are always using method declaration parameters
-                       for (int i = 0; i < methodDefinition.Parameters.Count; ++i ) {
-                               Parameters [i].Name = methodDefinition.Parameters [i].Name;
-                               Parameters [i].DefaultValue = methodDefinition.Parameters [i].DefaultValue;
+                       for (int i = 0; i < methodDefinition.parameters.Count; ++i ) {
+                               parameters [i].Name = methodDefinition.parameters [i].Name;
+                               parameters [i].DefaultValue = methodDefinition.parameters [i].DefaultValue;
                        }
 
                        if (methodDefinition.attributes == null)
@@ -944,26 +1194,12 @@ namespace Mono.CSharp {
                                attributes.Attrs.AddRange (methodDefinition.attributes.Attrs);
                        }
                }
-
-               protected override bool VerifyClsCompliance ()
-               {
-                       if (!base.VerifyClsCompliance ())
-                               return false;
-
-                       if (!Parameters.IsEmpty) {
-                               var al = Parent.PartialContainer.MemberCache.Members [Name];
-                               if (al.Count > 1)
-                                       MemberCache.VerifyClsParameterConflict (al, this, MethodBuilder, Report);
-                       }
-
-                       return true;
-               }
        }
 
        public abstract class ConstructorInitializer : ExpressionStatement
        {
                Arguments argument_list;
-               MethodGroupExpr base_constructor_group;
+               MethodSpec base_ctor;
 
                public ConstructorInitializer (Arguments argument_list, Location loc)
                {
@@ -986,8 +1222,8 @@ namespace Mono.CSharp {
                {
                        eclass = ExprClass.Value;
 
-                       // TODO: ec.GetSignatureForError ()
-                       ConstructorBuilder caller_builder = ((Constructor) ec.MemberContext).ConstructorBuilder;
+                       // FIXME: Hack
+                       var caller_builder = (Constructor) ec.MemberContext;
 
                        if (argument_list != null) {
                                bool dynamic;
@@ -1013,9 +1249,9 @@ namespace Mono.CSharp {
                                        return this;
 
                                type = ec.CurrentType.BaseType;
-                               if (TypeManager.IsStruct (ec.CurrentType)) {
+                               if (ec.CurrentType.IsStruct) {
                                        ec.Report.Error (522, loc,
-                                               "`{0}': Struct constructors cannot call base constructors", TypeManager.CSharpSignature (caller_builder));
+                                               "`{0}': Struct constructors cannot call base constructors", caller_builder.GetSignatureForError ());
                                        return this;
                                }
                        } else {
@@ -1029,27 +1265,12 @@ namespace Mono.CSharp {
                                        return this;                    
                        }
 
-                       base_constructor_group = MemberLookupFinal (
-                               ec, null, type, ConstructorBuilder.ConstructorName, MemberTypes.Constructor,
-                               BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
-                               loc) as MethodGroupExpr;
-                       
-                       if (base_constructor_group == null)
-                               return this;
-                       
-                       base_constructor_group = base_constructor_group.OverloadResolve (
-                               ec, ref argument_list, false, loc);
-                       
-                       if (base_constructor_group == null)
-                               return this;
-
-                       if (!ec.IsStatic)
-                               base_constructor_group.InstanceExpression = ec.GetThis (loc);
-                       
-                       var base_ctor = base_constructor_group.BestCandidate;
-
-                       if (base_ctor.MetaInfo == caller_builder){
-                               ec.Report.Error (516, loc, "Constructor `{0}' cannot call itself", TypeManager.CSharpSignature (caller_builder));
+                       base_ctor = ConstructorLookup (ec, type, ref argument_list, loc);
+       
+                       // TODO MemberCache: Does it work for inflated types ?
+                       if (base_ctor == caller_builder.Spec){
+                               ec.Report.Error (516, loc, "Constructor `{0}' cannot call itself",
+                                       caller_builder.GetSignatureForError ());
                        }
                                                
                        return this;
@@ -1058,12 +1279,12 @@ namespace Mono.CSharp {
                public override void Emit (EmitContext ec)
                {
                        // It can be null for static initializers
-                       if (base_constructor_group == null)
+                       if (base_ctor == null)
                                return;
                        
                        ec.Mark (loc);
 
-                       base_constructor_group.EmitCall (ec, argument_list);
+                       Invocation.EmitCall (ec, new CompilerGeneratedThis (type, loc), base_ctor, argument_list, loc);
                }
 
                public override void EmitStatement (EmitContext ec)
@@ -1113,6 +1334,9 @@ namespace Mono.CSharp {
 
                static readonly string[] attribute_targets = new string [] { "method" };
 
+               public static readonly string ConstructorName = ".ctor";
+               public static readonly string TypeConstructorName = ".cctor";
+
                //
                // The spec claims that static is not permitted, but
                // my very own code has static constructors.
@@ -1139,14 +1363,14 @@ namespace Mono.CSharp {
                public bool IsDefault ()
                {
                        if ((ModFlags & Modifiers.STATIC) != 0)
-                               return Parameters.IsEmpty;
-                       
-                       return Parameters.IsEmpty &&
+                               return parameters.IsEmpty;
+
+                       return parameters.IsEmpty &&
                                        (Initializer is ConstructorBaseInitializer) &&
                                        (Initializer.Arguments == null);
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.IsValidSecurityAttribute ()) {
                                if (declarative_security == null) {
@@ -1156,17 +1380,17 @@ namespace Mono.CSharp {
                                return;
                        }
 
-                       if (a.IsInternalMethodImplAttribute) {
-                               is_external_implementation = true;
+                       if (a.Type == pa.MethodImpl) {
+                               is_external_implementation = a.IsInternalCall ();
                        }
 
-                       ConstructorBuilder.SetCustomAttribute (cb);
+                       ConstructorBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), cdata);
                }
 
                protected override bool CheckBase ()
                {
                        if ((ModFlags & Modifiers.STATIC) != 0) {
-                               if (!Parameters.IsEmpty) {
+                               if (!parameters.IsEmpty) {
                                        Report.Error (132, Location, "`{0}': The static constructor must be parameterless",
                                                GetSignatureForError ());
                                        return false;
@@ -1177,19 +1401,16 @@ namespace Mono.CSharp {
                        }
 
                        // Check whether arguments were correct.
-                       if (!DefineParameters (Parameters))
+                       if (!DefineParameters (parameters))
                                return false;
 
                        if ((caching_flags & Flags.MethodOverloadsExist) != 0)
-                               Parent.MemberCache.CheckExistingMembersOverloads (this, ConstructorInfo.ConstructorName,
-                                       Parameters, Report);
+                               Parent.MemberCache.CheckExistingMembersOverloads (this, parameters);
 
-                       if (Parent.PartialContainer.Kind == Kind.Struct) {
-                               if (Parameters.Count == 0) {
-                                       Report.Error (568, Location, 
-                                               "Structs cannot contain explicit parameterless constructors");
-                                       return false;
-                               }
+                       if (Parent.PartialContainer.Kind == MemberKind.Struct && parameters.IsEmpty) {
+                               Report.Error (568, Location, 
+                                       "Structs cannot contain explicit parameterless constructors");
+                               return false;
                        }
 
                        CheckProtectedModifier ();
@@ -1205,25 +1426,12 @@ namespace Mono.CSharp {
                        if (ConstructorBuilder != null)
                                return true;
 
-                       MethodAttributes ca = (MethodAttributes.RTSpecialName |
-                                              MethodAttributes.SpecialName);
+                       var ca = MethodAttributes.RTSpecialName | MethodAttributes.SpecialName;
                        
                        if ((ModFlags & Modifiers.STATIC) != 0) {
                                ca |= MethodAttributes.Static | MethodAttributes.Private;
                        } else {
-                               ca |= MethodAttributes.HideBySig;
-
-                               if ((ModFlags & Modifiers.PUBLIC) != 0)
-                                       ca |= MethodAttributes.Public;
-                               else if ((ModFlags & Modifiers.PROTECTED) != 0){
-                                       if ((ModFlags & Modifiers.INTERNAL) != 0)
-                                               ca |= MethodAttributes.FamORAssem;
-                                       else 
-                                               ca |= MethodAttributes.Family;
-                               } else if ((ModFlags & Modifiers.INTERNAL) != 0)
-                                       ca |= MethodAttributes.Assembly;
-                               else
-                                       ca |= MethodAttributes.Private;
+                               ca |= ModifiersExtensions.MethodAttr (ModFlags);
                        }
 
                        if (!CheckAbstractAndExtern (block != null))
@@ -1235,20 +1443,11 @@ namespace Mono.CSharp {
 
                        ConstructorBuilder = Parent.TypeBuilder.DefineConstructor (
                                ca, CallingConventions,
-                               Parameters.GetEmitTypes ());
+                               parameters.GetMetaInfo ());
 
-                       spec = new MethodSpec (this, ConstructorBuilder, Parameters, ModFlags);
-
-                       if (Parent.PartialContainer.IsComImport) {
-                               if (!IsDefault ()) {
-                                       Report.Error (669, Location, "`{0}': A class with the ComImport attribute cannot have a user-defined constructor",
-                                               Parent.GetSignatureForError ());
-                               }
-                               ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.InternalCall);
-                       }
+                       spec = new MethodSpec (MemberKind.Constructor, Parent.Definition, this, TypeManager.void_type, ConstructorBuilder, parameters, ModFlags);
                        
-                       Parent.MemberCache.AddMember (ConstructorBuilder, this);
-                       TypeManager.AddMethod (ConstructorBuilder, this);
+                       Parent.MemberCache.AddMember (spec);
                        
                        // It's here only to report an error
                        if (block != null && block.IsIterator) {
@@ -1264,8 +1463,16 @@ namespace Mono.CSharp {
                //
                public override void Emit ()
                {
+                       if (Parent.PartialContainer.IsComImport) {
+                               if (!IsDefault ()) {
+                                       Report.Error (669, Location, "`{0}': A class with the ComImport attribute cannot have a user-defined constructor",
+                                               Parent.GetSignatureForError ());
+                               }
+                               ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.InternalCall);
+                       }
+
                        if ((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0)
-                               PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (ConstructorBuilder);
+                               Module.PredefinedAttributes.DebuggerHidden.EmitAttribute (ConstructorBuilder);
 
                        if (OptAttributes != null)
                                OptAttributes.Emit ();
@@ -1288,12 +1495,12 @@ namespace Mono.CSharp {
                        if (block != null) {
                                // If this is a non-static `struct' constructor and doesn't have any
                                // initializer, it must initialize all of the struct's fields.
-                               if ((Parent.PartialContainer.Kind == Kind.Struct) &&
+                               if ((Parent.PartialContainer.Kind == MemberKind.Struct) &&
                                        ((ModFlags & Modifiers.STATIC) == 0) && (Initializer == null))
-                                       block.AddThisVariable (Parent, Location);
+                                       block.AddThisVariable (bc, Parent, Location);
 
                                if (block != null && (ModFlags & Modifiers.STATIC) == 0){
-                                       if (Parent.PartialContainer.Kind == Kind.Class && Initializer == null)
+                                       if (Parent.PartialContainer.Kind == MemberKind.Class && Initializer == null)
                                                Initializer = new GeneratedBaseInitializer (Location);
 
                                        if (Initializer != null) {
@@ -1302,12 +1509,12 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       Parameters.ApplyAttributes (ConstructorBuilder);
+                       parameters.ApplyAttributes (this, ConstructorBuilder);
 
                        SourceMethod source = SourceMethod.Create (Parent, ConstructorBuilder, block);
 
                        if (block != null) {
-                               if (block.Resolve (null, bc, Parameters, this)) {
+                               if (block.Resolve (null, bc, this)) {
                                        EmitContext ec = new EmitContext (this, ConstructorBuilder.GetILGenerator (), bc.ReturnType);
                                        ec.With (EmitContext.Options.ConstructorScope, true);
 
@@ -1332,15 +1539,16 @@ namespace Mono.CSharp {
                        block = null;
                }
 
-               // Is never override
-               protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+               protected override MemberSpec FindBaseMember (out MemberSpec bestCandidate)
                {
+                       // Is never override
+                       bestCandidate = null;
                        return null;
                }
 
                public override string GetSignatureForError()
                {
-                       return base.GetSignatureForError () + Parameters.GetSignatureForError ();
+                       return base.GetSignatureForError () + parameters.GetSignatureForError ();
                }
 
                public override string[] ValidAttributeTargets {
@@ -1354,20 +1562,15 @@ namespace Mono.CSharp {
                        if (!base.VerifyClsCompliance () || !IsExposedFromAssembly ()) {
                                return false;
                        }
-                       
-                       if (!Parameters.IsEmpty) {
-                               var al = Parent.MemberCache.Members [ConstructorInfo.ConstructorName];
-                               if (al.Count > 2)
-                                       MemberCache.VerifyClsParameterConflict (al, this, ConstructorBuilder, Report);
-                               if (TypeManager.IsSubclassOf (Parent.TypeBuilder, TypeManager.attribute_type)) {
-                                       foreach (Type param in Parameters.Types) {
-                                               if (param.IsArray) {
-                                                       return true;
-                                               }
+
+                       if (!parameters.IsEmpty && Parent.Definition.IsAttribute) {
+                               foreach (TypeSpec param in parameters.Types) {
+                                       if (param.IsArray) {
+                                               return true;
                                        }
                                }
                        }
+
                        has_compliant_args = true;
                        return true;
                }
@@ -1380,7 +1583,7 @@ namespace Mono.CSharp {
                        }
                }
 
-               public Type ReturnType {
+               public TypeSpec ReturnType {
                        get {
                                return MemberType;
                        }
@@ -1416,19 +1619,16 @@ namespace Mono.CSharp {
                CallingConventions CallingConventions { get; }
                Location Location { get; }
                MemberName MethodName { get; }
-               Type ReturnType { get; }
+               TypeSpec ReturnType { get; }
                GenericMethod GenericMethod { get; }
                ParametersCompiled ParameterInfo { get; }
+               MethodSpec Spec { get; }
 
                Attributes OptAttributes { get; }
                ToplevelBlock Block { get; set; }
 
                EmitContext CreateEmitContext (ILGenerator ig);
-               ObsoleteAttribute GetObsoleteAttribute ();
                string GetSignatureForError ();
-               bool IsExcluded ();
-               bool IsClsComplianceRequired ();
-               void SetIsUsed ();
                void EmitExtraSymbolInfo (SourceMethod source);
        }
 
@@ -1444,7 +1644,7 @@ namespace Mono.CSharp {
                //
                // Are we implementing an interface ?
                //
-               public MethodInfo implementing;
+               public MethodSpec implementing;
 
                //
                // Protected data.
@@ -1452,17 +1652,17 @@ namespace Mono.CSharp {
                protected InterfaceMemberBase member;
                protected Modifiers modifiers;
                protected MethodAttributes flags;
-               protected Type declaring_type;
-               protected MethodInfo parent_method;
+               protected TypeSpec declaring_type;
+               protected MethodSpec parent_method;
 
-               MethodBuilder builder = null;
+               MethodBuilder builder;
                public MethodBuilder MethodBuilder {
                        get {
                                return builder;
                        }
                }
 
-               public Type DeclaringType {
+               public TypeSpec DeclaringType {
                        get {
                                return declaring_type;
                        }
@@ -1481,7 +1681,7 @@ namespace Mono.CSharp {
                public MethodData (InterfaceMemberBase member,
                                   Modifiers modifiers, MethodAttributes flags, 
                                   IMethodData method, MethodBuilder builder,
-                                  GenericMethod generic, MethodInfo parent_method)
+                                  GenericMethod generic, MethodSpec parent_method)
                        : this (member, modifiers, flags, method)
                {
                        this.builder = builder;
@@ -1491,13 +1691,11 @@ namespace Mono.CSharp {
 
                public bool Define (DeclSpace parent, string method_full_name, Report Report)
                {
-                       string name = method.MethodName.Basename;
-
                        TypeContainer container = parent.PartialContainer;
 
                        PendingImplementation pending = container.PendingImplementations;
                        if (pending != null){
-                               implementing = pending.IsInterfaceMethod (name, member.InterfaceType, this);
+                               implementing = pending.IsInterfaceMethod (method.MethodName, member.InterfaceType, this);
 
                                if (member.InterfaceType != null){
                                        if (implementing == null){
@@ -1513,7 +1711,7 @@ namespace Mono.CSharp {
                                                }
                                                return false;
                                        }
-                                       if (implementing.IsSpecialName && !(method is AbstractPropertyEventMethod)) {
+                                       if (implementing.IsAccessor && !(method is AbstractPropertyEventMethod)) {
                                                Report.SymbolRelatedToPreviousError (implementing);
                                                Report.Error (683, method.Location, "`{0}' explicit method implementation cannot implement `{1}' because it is an accessor",
                                                        member.GetSignatureForError (), TypeManager.CSharpSignature (implementing));
@@ -1523,25 +1721,23 @@ namespace Mono.CSharp {
                                        if (implementing != null) {
                                                AbstractPropertyEventMethod prop_method = method as AbstractPropertyEventMethod;
                                                if (prop_method == null) {
-                                                       if (TypeManager.IsSpecialMethod (implementing)) {
+                                                       if (implementing.IsAccessor) {
                                                                Report.SymbolRelatedToPreviousError (implementing);
-                                                               Report.Error (470, method.Location, "Method `{0}' cannot implement interface accessor `{1}.{2}'",
-                                                                       method.GetSignatureForError (), TypeManager.CSharpSignature (implementing),
-                                                                       implementing.Name.StartsWith ("get_") ? "get" : "set");
+                                                               Report.Error (470, method.Location, "Method `{0}' cannot implement interface accessor `{1}'",
+                                                                       method.GetSignatureForError (), TypeManager.CSharpSignature (implementing));
                                                        }
                                                } else if (implementing.DeclaringType.IsInterface) {
-                                                       if (!implementing.IsSpecialName) {
+                                                       if (!implementing.IsAccessor) {
                                                                Report.SymbolRelatedToPreviousError (implementing);
                                                                Report.Error (686, method.Location, "Accessor `{0}' cannot implement interface member `{1}' for type `{2}'. Use an explicit interface implementation",
                                                                        method.GetSignatureForError (), TypeManager.CSharpSignature (implementing), container.GetSignatureForError ());
-                                                               return false;
-                                                       }
-                                                       PropertyBase.PropertyMethod pm = prop_method as PropertyBase.PropertyMethod;
-                                                       if (pm != null && pm.HasCustomAccessModifier && (pm.ModFlags & Modifiers.PUBLIC) == 0) {
-                                                               Report.SymbolRelatedToPreviousError (implementing);
-                                                               Report.Error (277, method.Location, "Accessor `{0}' must be declared public to implement interface member `{1}'",
-                                                                       method.GetSignatureForError (), TypeManager.CSharpSignature (implementing, true));
-                                                               return false;
+                                                       } else {
+                                                               PropertyBase.PropertyMethod pm = prop_method as PropertyBase.PropertyMethod;
+                                                               if (pm != null && pm.HasCustomAccessModifier && (pm.ModFlags & Modifiers.PUBLIC) == 0) {
+                                                                       Report.SymbolRelatedToPreviousError (implementing);
+                                                                       Report.Error (277, method.Location, "Accessor `{0}' must be declared public to implement interface member `{1}'",
+                                                                               method.GetSignatureForError (), implementing.GetSignatureForError ());
+                                                               }
                                                        }
                                                }
                                        }
@@ -1561,11 +1757,10 @@ namespace Mono.CSharp {
                                // but it wont get cleared
                                //
                                if (member.IsExplicitImpl){
-                                       if (method.ParameterInfo.HasParams && !TypeManager.GetParameterData (implementing).HasParams) {
+                                       if (method.ParameterInfo.HasParams && !implementing.Parameters.HasParams) {
                                                Report.SymbolRelatedToPreviousError (implementing);
                                                Report.Error (466, method.Location, "`{0}': the explicit interface implementation cannot introduce the params modifier",
                                                        method.GetSignatureForError ());
-                                               return false;
                                        }
                                } else {
                                        if (implementing.DeclaringType.IsInterface) {
@@ -1609,13 +1804,24 @@ namespace Mono.CSharp {
                                        if ((modifiers & Modifiers.OVERRIDE) == 0)
                                                flags |= MethodAttributes.NewSlot;
                                }
-                               flags |=
-                                       MethodAttributes.Virtual |
-                                       MethodAttributes.HideBySig;
+
+                               flags |= MethodAttributes.Virtual | MethodAttributes.HideBySig;
 
                                // Set Final unless we're virtual, abstract or already overriding a method.
                                if ((modifiers & (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE)) == 0)
                                        flags |= MethodAttributes.Final;
+
+                               //
+                               // clear the pending implementation flag (requires explicit methods to be defined first)
+                               //
+                               parent.PartialContainer.PendingImplementations.ImplementMethod (method.MethodName,
+                                       member.InterfaceType, this, member.IsExplicitImpl);
+
+                               //
+                               // Update indexer accessor name to match implementing abstract accessor
+                               //
+                               if (!implementing.DeclaringType.IsInterface && !member.IsExplicitImpl && implementing.IsAccessor)
+                                       method_full_name = implementing.MemberDefinition.Name;
                        }
 
                        DefineMethodBuilder (container, method_full_name, method.ParameterInfo);
@@ -1623,26 +1829,13 @@ namespace Mono.CSharp {
                        if (builder == null)
                                return false;
 
-                       if (container.CurrentType != null)
-                               declaring_type = container.CurrentType;
-                       else
-                               declaring_type = container.TypeBuilder;
+//                     if (container.CurrentType != null)
+//                             declaring_type = container.CurrentType;
+//                     else
+                               declaring_type = container.Definition;
 
                        if (implementing != null && member.IsExplicitImpl) {
-                                       container.TypeBuilder.DefineMethodOverride (builder, implementing);
-                       }
-
-                       TypeManager.AddMethod (builder, method);
-
-                       if (GenericMethod != null) {
-                               bool is_override = member.IsExplicitImpl |
-                                       ((modifiers & Modifiers.OVERRIDE) != 0);
-
-                               if (implementing != null)
-                                       parent_method = implementing;
-
-                               if (!GenericMethod.DefineType (GenericMethod, builder, parent_method, is_override))
-                                       return false;
+                               container.TypeBuilder.DefineMethodOverride (builder, (MethodInfo) implementing.GetMetaInfo ());
                        }
 
                        return true;
@@ -1654,11 +1847,13 @@ namespace Mono.CSharp {
                /// </summary>
                void DefineMethodBuilder (TypeContainer container, string method_name, ParametersCompiled param)
                {
+                       var return_type = method.ReturnType.GetMetaInfo ();
+                       var p_types = param.GetMetaInfo ();
+
                        if (builder == null) {
                                builder = container.TypeBuilder.DefineMethod (
                                        method_name, flags, method.CallingConventions,
-                                       method.ReturnType,
-                                       param.GetEmitTypes ());
+                                       return_type, p_types);
                                return;
                        }
 
@@ -1666,8 +1861,8 @@ namespace Mono.CSharp {
                        // Generic method has been already defined to resolve method parameters
                        // correctly when they use type parameters
                        //
-                       builder.SetParameters (param.GetEmitTypes ());
-                       builder.SetReturnType (method.ReturnType);
+                       builder.SetParameters (p_types);
+                       builder.SetReturnType (return_type);
                        if (builder.Attributes != flags) {
                                try {
                                        if (methodbuilder_attrs_field == null)
@@ -1684,24 +1879,19 @@ namespace Mono.CSharp {
                // 
                public void Emit (DeclSpace parent)
                {
-                       method.ParameterInfo.ApplyAttributes (MethodBuilder);
-
                        if (GenericMethod != null)
                                GenericMethod.EmitAttributes ();
 
-                       //
-                       // clear the pending implementation flag
-                       //
-                       if (implementing != null)
-                               parent.PartialContainer.PendingImplementations.ImplementMethod (method.MethodName.Basename,
-                                       member.InterfaceType, this, member.IsExplicitImpl);
+                       var mc = (IMemberContext) method;
+
+                       method.ParameterInfo.ApplyAttributes (mc, MethodBuilder);
 
                        SourceMethod source = SourceMethod.Create (parent, MethodBuilder, method.Block);
 
                        ToplevelBlock block = method.Block;
                        if (block != null) {
-                               BlockContext bc = new BlockContext ((IMemberContext) method, block, method.ReturnType);
-                               if (block.Resolve (null, bc, method.ParameterInfo, method)) {
+                               BlockContext bc = new BlockContext (mc, block, method.ReturnType);
+                               if (block.Resolve (null, bc, method)) {
                                        EmitContext ec = method.CreateEmitContext (MethodBuilder.GetILGenerator ());
                                        if (!ec.HasReturnLabel && bc.HasReturnLabel) {
                                                ec.ReturnLabel = bc.ReturnLabel;
@@ -1730,45 +1920,44 @@ namespace Mono.CSharp {
                public static readonly string MetadataName = "Finalize";
 
                public Destructor (DeclSpace parent, Modifiers mod, ParametersCompiled parameters, Attributes attrs, Location l)
-                       : base (parent, null, TypeManager.system_void_expr, mod, AllowedModifiers,
+                       : base (parent, null, null, mod, AllowedModifiers,
                                new MemberName (MetadataName, l), attrs, parameters)
                {
                        ModFlags &= ~Modifiers.PRIVATE;
                        ModFlags |= Modifiers.PROTECTED | Modifiers.OVERRIDE;
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Type == pa.Conditional) {
                                Error_ConditionalAttributeIsNotValid ();
                                return;
                        }
 
-                       base.ApplyAttributeBuilder (a, cb, pa);
+                       base.ApplyAttributeBuilder (a, ctor, cdata, pa);
                }
 
                protected override bool CheckBase ()
                {
-                       if (!base.CheckBase ())
-                               return false;
-
-                       if (Parent.PartialContainer.BaseCache == null)
-                               return true;
+                       // Don't check base, destructors have special syntax
+                       return true;
+               }
 
-                       Type base_type = Parent.PartialContainer.BaseCache.Container.Type;
+               public override void Emit()
+               {
+                       var base_type = Parent.PartialContainer.BaseType;
                        if (base_type != null && Block != null) {
-                               MethodGroupExpr method_expr = Expression.MethodLookup (Parent.Module.Compiler, Parent.TypeBuilder, base_type, MetadataName, Location);
-                               if (method_expr == null)
-                                       throw new NotImplementedException ();
+                               var base_dtor = MemberCache.FindMember (base_type,
+                                       new MemberFilter (MetadataName, 0, MemberKind.Destructor, null, null), BindingRestriction.InstanceOnly) as MethodSpec;
 
-                               method_expr.IsBase = true;
-                               method_expr.InstanceExpression = new CompilerGeneratedThis (Parent.TypeBuilder, Location);
+                               if (base_dtor == null)
+                                       throw new NotImplementedException ();
 
-                               ToplevelBlock new_block = new ToplevelBlock (Compiler, Block.StartLocation);
-                               new_block.EndLocation = Block.EndLocation;
+                               MethodGroupExpr method_expr = MethodGroupExpr.CreatePredefined (base_dtor, base_type, Location);
+                               method_expr.InstanceExpression = new BaseThis (base_type, Location);
 
-                               Block finaly_block = new ExplicitBlock (new_block, Location, Location);
-                               Block try_block = new Block (new_block, block);
+                               var try_block = new ExplicitBlock (block, block.StartLocation, block.EndLocation);
+                               var finaly_block = new ExplicitBlock (block, Location, Location);
 
                                //
                                // 0-size arguments to avoid CS0250 error
@@ -1776,12 +1965,12 @@ namespace Mono.CSharp {
                                // debugger scope
                                //
                                finaly_block.AddStatement (new StatementExpression (new Invocation (method_expr, new Arguments (0))));
-                               new_block.AddStatement (new TryFinally (try_block, finaly_block, Location));
 
-                               block = new_block;
+                               var tf = new TryFinally (try_block, finaly_block, Location);
+                               block.WrapIntoDestructor (tf, try_block);
                        }
 
-                       return true;
+                       base.Emit ();
                }
 
                public override string GetSignatureForError ()
@@ -1789,9 +1978,10 @@ namespace Mono.CSharp {
                        return Parent.GetSignatureForError () + ".~" + Parent.MemberName.Name + "()";
                }
 
-               protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+               protected override bool ResolveMemberType ()
                {
-                       return null;
+                       member_type = TypeManager.void_type;
+                       return true;
                }
 
                public override string[] ValidAttributeTargets {
@@ -1808,29 +1998,14 @@ namespace Mono.CSharp {
                protected ToplevelBlock block;
                protected Dictionary<SecurityAction, PermissionSet> declarative_security;
 
-               // The accessor are created even if they are not wanted.
-               // But we need them because their names are reserved.
-               // Field says whether accessor will be emited or not
-               public readonly bool IsDummy;
-
                protected readonly string prefix;
 
                ReturnParameter return_attributes;
 
-               public AbstractPropertyEventMethod (PropertyBasedMember member, string prefix)
-                       : base (member.Parent, SetupName (prefix, member, member.Location), null)
+               public AbstractPropertyEventMethod (InterfaceMemberBase member, string prefix, Attributes attrs, Location loc)
+                       : base (member.Parent, SetupName (prefix, member, loc), attrs)
                {
                        this.prefix = prefix;
-                       IsDummy = true;
-               }
-
-               public AbstractPropertyEventMethod (InterfaceMemberBase member, Accessor accessor,
-                                                   string prefix)
-                       : base (member.Parent, SetupName (prefix, member, accessor.Location),
-                               accessor.Attributes)
-               {
-                       this.prefix = prefix;
-                       this.block = accessor.Block;
                }
 
                static MemberName SetupName (string prefix, InterfaceMemberBase member, Location loc)
@@ -1883,18 +2058,18 @@ namespace Mono.CSharp {
                        }
                }
 
-               public Type[] ParameterTypes { 
+               public TypeSpec[] ParameterTypes { 
                        get {
                                return ParameterInfo.Types;
                        }
                }
 
                public abstract ParametersCompiled ParameterInfo { get ; }
-               public abstract Type ReturnType { get; }
+               public abstract TypeSpec ReturnType { get; }
 
                #endregion
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Type == pa.CLSCompliant || a.Type == pa.Obsolete || a.Type == pa.Conditional) {
                                Report.Error (1667, a.Location,
@@ -1911,7 +2086,7 @@ namespace Mono.CSharp {
                        }
 
                        if (a.Target == AttributeTargets.Method) {
-                               method_data.MethodBuilder.SetCustomAttribute (cb);
+                               method_data.MethodBuilder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), cdata);
                                return;
                        }
 
@@ -1919,14 +2094,14 @@ namespace Mono.CSharp {
                                if (return_attributes == null)
                                        return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
 
-                               return_attributes.ApplyAttributeBuilder (a, cb, pa);
+                               return_attributes.ApplyAttributeBuilder (a, ctor, cdata, pa);
                                return;
                        }
 
-                       ApplyToExtraTarget (a, cb, pa);
+                       ApplyToExtraTarget (a, ctor, cdata, pa);
                }
 
-               protected virtual void ApplyToExtraTarget (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               protected virtual void ApplyToExtraTarget (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        throw new NotSupportedException ("You forgot to define special attribute target handling");
                }
@@ -1942,23 +2117,16 @@ namespace Mono.CSharp {
                        method_data.Emit (parent);
 
                        if ((ModFlags & Modifiers.COMPILER_GENERATED) != 0 && !Parent.IsCompilerGenerated)
-                               PredefinedAttributes.Get.CompilerGenerated.EmitAttribute (method_data.MethodBuilder);
+                               Module.PredefinedAttributes.CompilerGenerated.EmitAttribute (method_data.MethodBuilder);
                        if (((ModFlags & Modifiers.DEBUGGER_HIDDEN) != 0))
-                               PredefinedAttributes.Get.DebuggerHidden.EmitAttribute (method_data.MethodBuilder);
+                               Module.PredefinedAttributes.DebuggerHidden.EmitAttribute (method_data.MethodBuilder);
 
-                       if (TypeManager.IsDynamicType (ReturnType)) {
+                       if (ReturnType == InternalType.Dynamic) {
                                return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
-                               PredefinedAttributes.Get.Dynamic.EmitAttribute (return_attributes.Builder);
-                       } else {
-                               var trans_flags = TypeManager.HasDynamicTypeUsed (ReturnType);
-                               if (trans_flags != null) {
-                                       var pa = PredefinedAttributes.Get.DynamicTransform;
-                                       if (pa.Constructor != null || pa.ResolveConstructor (Location, TypeManager.bool_type.MakeArrayType ())) {
-                                               return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
-                                               return_attributes.Builder.SetCustomAttribute (
-                                                       new CustomAttributeBuilder (pa.Constructor, new object [] { trans_flags }));
-                                       }
-                               }
+                               Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder);
+                       } else if (ReturnType.HasDynamicElement) {
+                               return_attributes = new ReturnParameter (this, method_data.MethodBuilder, Location);
+                               Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder, ReturnType, Location);
                        }
 
                        if (OptAttributes != null)
@@ -1975,15 +2143,16 @@ namespace Mono.CSharp {
 
                public override bool EnableOverloadChecks (MemberCore overload)
                {
+                       if (overload is MethodCore) {
+                               caching_flags |= Flags.MethodOverloadsExist;
+                               return true;
+                       }
+
                        // This can only happen with indexers and it will
                        // be catched as indexer difference
                        if (overload is AbstractPropertyEventMethod)
                                return true;
 
-                       if (overload is MethodCore) {
-                               caching_flags |= Flags.MethodOverloadsExist;
-                               return true;
-                       }
                        return false;
                }
 
@@ -1992,35 +2161,7 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               public bool IsDuplicateImplementation (MethodCore method)
-               {
-                       if (!MemberName.Equals (method.MemberName))
-                               return false;
-
-                       Type[] param_types = method.ParameterTypes;
-
-                       if (param_types == null || param_types.Length != ParameterTypes.Length)
-                               return false;
-
-                       for (int i = 0; i < param_types.Length; i++)
-                               if (param_types [i] != ParameterTypes [i])
-                                       return false;
-
-                       Report.SymbolRelatedToPreviousError (method);
-                       Report.Error (82, Location, "A member `{0}' is already reserved",
-                               method.GetSignatureForError ());
-                       return true;
-               }
-
-               public override bool IsUsed
-               {
-                       get {
-                               if (IsDummy)
-                                       return false;
-
-                               return base.IsUsed;
-                       }
-               }
+               public MethodSpec Spec { get; protected set; }
 
                //
                //   Represents header string for documentation comment.
@@ -2127,14 +2268,14 @@ namespace Mono.CSharp {
                        Block = block;
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder cb, PredefinedAttributes pa)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Type == pa.Conditional) {
                                Error_ConditionalAttributeIsNotValid ();
                                return;
                        }
 
-                       base.ApplyAttributeBuilder (a, cb, pa);
+                       base.ApplyAttributeBuilder (a, ctor, cdata, pa);
                }
                
                public override bool Define ()
@@ -2147,87 +2288,91 @@ namespace Mono.CSharp {
                        if (!base.Define ())
                                return false;
 
+                       if (block != null && block.IsIterator) {
+                               //
+                               // Current method is turned into automatically generated
+                               // wrapper which creates an instance of iterator
+                               //
+                               Iterator.CreateIterator (this, Parent.PartialContainer, ModFlags, Compiler);
+                               ModFlags |= Modifiers.DEBUGGER_HIDDEN;
+                       }
+
                        // imlicit and explicit operator of same types are not allowed
                        if (OperatorType == OpType.Explicit)
-                               Parent.MemberCache.CheckExistingMembersOverloads (this, GetMetadataName (OpType.Implicit), Parameters, Report);
+                               Parent.MemberCache.CheckExistingMembersOverloads (this, GetMetadataName (OpType.Implicit), parameters);
                        else if (OperatorType == OpType.Implicit)
-                               Parent.MemberCache.CheckExistingMembersOverloads (this, GetMetadataName (OpType.Explicit), Parameters, Report);
+                               Parent.MemberCache.CheckExistingMembersOverloads (this, GetMetadataName (OpType.Explicit), parameters);
 
-                       Type declaring_type = MethodData.DeclaringType;
-                       Type return_type = MemberType;
-                       Type first_arg_type = ParameterTypes [0];
+                       TypeSpec declaring_type = Parent.CurrentType;
+                       TypeSpec return_type = MemberType;
+                       TypeSpec first_arg_type = ParameterTypes [0];
                        
-                       Type first_arg_type_unwrap = first_arg_type;
+                       TypeSpec first_arg_type_unwrap = first_arg_type;
                        if (TypeManager.IsNullableType (first_arg_type))
-                               first_arg_type_unwrap = TypeManager.TypeToCoreType (TypeManager.GetTypeArguments (first_arg_type) [0]);
+                               first_arg_type_unwrap = TypeManager.GetTypeArguments (first_arg_type) [0];
                        
-                       Type return_type_unwrap = return_type;
+                       TypeSpec return_type_unwrap = return_type;
                        if (TypeManager.IsNullableType (return_type))
-                               return_type_unwrap = TypeManager.TypeToCoreType (TypeManager.GetTypeArguments (return_type) [0]);
-
-                       if (TypeManager.IsDynamicType (return_type) || TypeManager.IsDynamicType (first_arg_type)) {
-                               Report.Error (1964, Location,
-                                       "User-defined operator `{0}' cannot convert to or from the dynamic type",
-                                       GetSignatureForError ());
-
-                               return false;
-                       }
+                               return_type_unwrap = TypeManager.GetTypeArguments (return_type) [0];
 
                        //
                        // Rules for conversion operators
                        //
                        if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
-                               if (first_arg_type_unwrap == return_type_unwrap && first_arg_type_unwrap == declaring_type){
+                               if (first_arg_type_unwrap == return_type_unwrap && first_arg_type_unwrap == declaring_type) {
                                        Report.Error (555, Location,
                                                "User-defined operator cannot take an object of the enclosing type and convert to an object of the enclosing type");
                                        return false;
                                }
-                               
-                               Type conv_type;
-                               if (TypeManager.IsEqual (declaring_type, return_type) || declaring_type == return_type_unwrap) {
+
+                               TypeSpec conv_type;
+                               if (declaring_type == return_type || declaring_type == return_type_unwrap) {
                                        conv_type = first_arg_type;
-                               } else if (TypeManager.IsEqual (declaring_type, first_arg_type) || declaring_type == first_arg_type_unwrap) {
+                               } else if (declaring_type == first_arg_type || declaring_type == first_arg_type_unwrap) {
                                        conv_type = return_type;
                                } else {
-                                       Report.Error (556, Location, 
+                                       Report.Error (556, Location,
                                                "User-defined conversion must convert to or from the enclosing type");
                                        return false;
                                }
 
-                               //
-                               // Because IsInterface and IsClass are not supported
-                               //
-                               if (!TypeManager.IsGenericParameter (conv_type)) {
-                                       if (conv_type.IsInterface) {
-                                               Report.Error (552, Location, "User-defined conversion `{0}' cannot convert to or from an interface type",
+                               if (conv_type == InternalType.Dynamic) {
+                                       Report.Error (1964, Location,
+                                               "User-defined conversion `{0}' cannot convert to or from the dynamic type",
+                                               GetSignatureForError ());
+
+                                       return false;
+                               }
+
+                               if (conv_type.IsInterface) {
+                                       Report.Error (552, Location, "User-defined conversion `{0}' cannot convert to or from an interface type",
+                                               GetSignatureForError ());
+                                       return false;
+                               }
+
+                               if (conv_type.IsClass) {
+                                       if (TypeSpec.IsBaseClass (declaring_type, conv_type, true)) {
+                                               Report.Error (553, Location, "User-defined conversion `{0}' cannot convert to or from a base class",
                                                        GetSignatureForError ());
                                                return false;
                                        }
 
-                                       if (conv_type.IsClass) {
-                                               if (TypeManager.IsSubclassOf (declaring_type, conv_type)) {
-                                                       Report.Error (553, Location, "User-defined conversion `{0}' cannot convert to or from a base class",
-                                                               GetSignatureForError ());
-                                                       return false;
-                                               }
-
-                                               if (TypeManager.IsSubclassOf (conv_type, declaring_type)) {
-                                                       Report.Error (554, Location, "User-defined conversion `{0}' cannot convert to or from a derived class",
-                                                               GetSignatureForError ());
-                                                       return false;
-                                               }
+                                       if (TypeSpec.IsBaseClass (conv_type, declaring_type, false)) {
+                                               Report.Error (554, Location, "User-defined conversion `{0}' cannot convert to or from a derived class",
+                                                       GetSignatureForError ());
+                                               return false;
                                        }
                                }
                        } else if (OperatorType == OpType.LeftShift || OperatorType == OpType.RightShift) {
-                               if (first_arg_type != declaring_type || Parameters.Types [1] != TypeManager.int32_type) {
+                               if (first_arg_type != declaring_type || parameters.Types[1] != TypeManager.int32_type) {
                                        Report.Error (564, Location, "Overloaded shift operator must have the type of the first operand be the containing type, and the type of the second operand must be int");
                                        return false;
                                }
-                       } else if (Parameters.Count == 1) {
+                       } else if (parameters.Count == 1) {
                                // Checks for Unary operators
 
                                if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
-                                       if (return_type != declaring_type && !TypeManager.IsSubclassOf (return_type, declaring_type)) {
+                                       if (return_type != declaring_type && !TypeSpec.IsBaseClass (return_type, declaring_type, false)) {
                                                Report.Error (448, Location,
                                                        "The return type for ++ or -- operator must be the containing type or derived from the containing type");
                                                return false;
@@ -2238,15 +2383,15 @@ namespace Mono.CSharp {
                                                return false;
                                        }
                                }
-                               
-                               if (!TypeManager.IsEqual (first_arg_type_unwrap, declaring_type)){
+
+                               if (first_arg_type_unwrap != declaring_type) {
                                        Report.Error (562, Location,
                                                "The parameter type of a unary operator must be the containing type");
                                        return false;
                                }
-                               
+
                                if (OperatorType == OpType.True || OperatorType == OpType.False) {
-                                       if (return_type != TypeManager.bool_type){
+                                       if (return_type != TypeManager.bool_type) {
                                                Report.Error (
                                                        215, Location,
                                                        "The return type of operator True or False " +
@@ -2254,15 +2399,15 @@ namespace Mono.CSharp {
                                                return false;
                                        }
                                }
-                               
-                       } else if (!TypeManager.IsEqual (first_arg_type_unwrap, declaring_type)) {
+
+                       } else if (first_arg_type_unwrap != declaring_type) {
                                // Checks for Binary operators
 
-                               var second_arg_type = ParameterTypes [1];
+                               var second_arg_type = ParameterTypes[1];
                                if (TypeManager.IsNullableType (second_arg_type))
-                                       second_arg_type = TypeManager.TypeToCoreType (TypeManager.GetTypeArguments (second_arg_type) [0]);
+                                       second_arg_type = TypeManager.GetTypeArguments (second_arg_type)[0];
 
-                               if (!TypeManager.IsEqual (second_arg_type, declaring_type)) {
+                               if (second_arg_type != declaring_type) {
                                        Report.Error (563, Location,
                                                "One of the parameters of a binary operator must be the containing type");
                                        return false;
@@ -2281,9 +2426,10 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               // Operator cannot be override
-               protected override MethodInfo FindOutBaseMethod (ref Type base_ret_type)
+               protected override MemberSpec FindBaseMember (out MemberSpec bestCandidate)
                {
+                       // Operator cannot be override
+                       bestCandidate = null;
                        return null;
                }
 
@@ -2315,6 +2461,16 @@ namespace Mono.CSharp {
                        return null;
                }
 
+               public static OpType? GetType (string metadata_name)
+               {
+                       for (int i = 0; i < names.Length; ++i) {
+                               if (names[i][1] == metadata_name)
+                                       return (OpType) i;
+                       }
+
+                       return null;
+               }
+
                public OpType GetMatchingOperator ()
                {
                        switch (OperatorType) {
@@ -2344,136 +2500,15 @@ namespace Mono.CSharp {
                        StringBuilder sb = new StringBuilder ();
                        if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
                                sb.AppendFormat ("{0}.{1} operator {2}",
-                                       Parent.GetSignatureForError (), GetName (OperatorType), type_name.GetSignatureForError ());
+                                       Parent.GetSignatureForError (), GetName (OperatorType), type_expr.GetSignatureForError ());
                        }
                        else {
                                sb.AppendFormat ("{0}.operator {1}", Parent.GetSignatureForError (), GetName (OperatorType));
                        }
 
-                       sb.Append (Parameters.GetSignatureForError ());
+                       sb.Append (parameters.GetSignatureForError ());
                        return sb.ToString ();
                }
        }
-
-       //
-       // This is used to compare method signatures
-       //
-       struct MethodSignature {
-               public string Name;
-               public Type RetType;
-               public Type [] Parameters;
-               
-               /// <summary>
-               ///    This delegate is used to extract methods which have the
-               ///    same signature as the argument
-               /// </summary>
-               public static MemberFilter method_signature_filter = new MemberFilter (MemberSignatureCompare);
-               
-               public MethodSignature (string name, Type ret_type, Type [] parameters)
-               {
-                       Name = name;
-                       RetType = ret_type;
-
-                       if (parameters == null)
-                               Parameters = Type.EmptyTypes;
-                       else
-                               Parameters = parameters;
-               }
-
-               public override string ToString ()
-               {
-                       string pars = "";
-                       if (Parameters.Length != 0){
-                               System.Text.StringBuilder sb = new System.Text.StringBuilder ();
-                               for (int i = 0; i < Parameters.Length; i++){
-                                       sb.Append (Parameters [i]);
-                                       if (i+1 < Parameters.Length)
-                                               sb.Append (", ");
-                               }
-                               pars = sb.ToString ();
-                       }
-
-                       return String.Format ("{0} {1} ({2})", RetType, Name, pars);
-               }
-               
-               public override int GetHashCode ()
-               {
-                       return Name.GetHashCode ();
-               }
-
-               public override bool Equals (Object o)
-               {
-                       MethodSignature other = (MethodSignature) o;
-
-                       if (other.Name != Name)
-                               return false;
-
-                       if (other.RetType != RetType)
-                               return false;
-                       
-                       if (Parameters == null){
-                               if (other.Parameters == null)
-                                       return true;
-                               return false;
-                       }
-
-                       if (other.Parameters == null)
-                               return false;
-                       
-                       int c = Parameters.Length;
-                       if (other.Parameters.Length != c)
-                               return false;
-
-                       for (int i = 0; i < c; i++)
-                               if (other.Parameters [i] != Parameters [i])
-                                       return false;
-
-                       return true;
-               }
-
-               static bool MemberSignatureCompare (MemberInfo m, object filter_criteria)
-               {
-                       MethodSignature sig = (MethodSignature) filter_criteria;
-
-                       if (m.Name != sig.Name)
-                               return false;
-
-                       Type ReturnType;
-                       MethodInfo mi = m as MethodInfo;
-                       PropertyInfo pi = m as PropertyInfo;
-
-                       if (mi != null)
-                               ReturnType = mi.ReturnType;
-                       else if (pi != null)
-                               ReturnType = pi.PropertyType;
-                       else
-                               return false;
-
-                       //
-                       // we use sig.RetType == null to mean `do not check the
-                       // method return value.  
-                       //
-                       if (sig.RetType != null) {
-                               if (!TypeManager.IsEqual (ReturnType, sig.RetType))
-                                       return false;
-                       }
-
-                       Type [] args;
-                       if (mi != null)
-                               args = TypeManager.GetParameterData (mi).Types;
-                       else
-                               args = TypeManager.GetParameterData (pi).Types;
-                       Type [] sigp = sig.Parameters;
-
-                       if (args.Length != sigp.Length)
-                               return false;
-
-                       for (int i = args.Length - 1; i >= 0; i--)
-                               if (!TypeManager.IsEqual (args [i], sigp [i]))
-                                       return false;
-
-                       return true;
-               }
-       }
 }