New tests.
[mono.git] / mcs / mcs / codegen.cs
index c4e28ce9387f5221a02b3a678428f70f7cc3302b..d7c7233499ce1be5c8e656c96c8d2a4aeece2624 100644 (file)
 //
 // Only remove it if you need to debug locally on your tree.
 //
-#define PRODUCTION
+//#define PRODUCTION
 
 using System;
 using System.IO;
-using System.Collections;
-using System.Collections.Specialized;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -40,7 +39,6 @@ namespace Mono.CSharp {
                static AppDomain current_domain;
 
                public static AssemblyClass Assembly;
-               public static ModuleClass Module;
 
                static CodeGen ()
                {
@@ -50,7 +48,6 @@ namespace Mono.CSharp {
                public static void Reset ()
                {
                        Assembly = new AssemblyClass ();
-                       Module = new ModuleClass (RootContext.Unsafe);
                }
 
                public static string Basename (string name)
@@ -83,18 +80,6 @@ namespace Mono.CSharp {
 
                static public string FileName;
 
-               //
-               // Initializes the symbol writer
-               //
-               static void InitializeSymbolWriter (string filename)
-               {
-                       if (!SymbolWriter.Initialize (Module.Builder, filename)) {
-                               Report.Warning (
-                                       -18, 1, "Could not find the symbol writer assembly (Mono.CompilerServices.SymbolWriter.dll). This is normally an installation problem. Please make sure to compile and install the mcs/class/Mono.CompilerServices.SymbolWriter directory.");
-                               return;
-                       }
-               }
-
 #if MS_COMPATIBLE
                const AssemblyBuilderAccess COMPILER_ACCESS = 0;
 #else
@@ -105,19 +90,21 @@ namespace Mono.CSharp {
                //
                // Initializes the code generator variables for interactive use (repl)
                //
-               static public void InitDynamic (string name)
+               static public void InitDynamic (CompilerContext ctx, string name)
                {
                        current_domain = AppDomain.CurrentDomain;
                        AssemblyName an = Assembly.GetAssemblyName (name, name);
                        
                        Assembly.Builder = current_domain.DefineDynamicAssembly (an, AssemblyBuilderAccess.Run | COMPILER_ACCESS);
-                       Module.Builder = Assembly.Builder.DefineDynamicModule (Basename (name), false);
+                       RootContext.ToplevelTypes = new ModuleCompiled (ctx, true);
+                       RootContext.ToplevelTypes.Builder = Assembly.Builder.DefineDynamicModule (Basename (name), false);
+                       Assembly.Name = Assembly.Builder.GetName ();
                }
                
                //
                // Initializes the code generator variables
                //
-               static public bool Init (string name, string output, bool want_debugging_support)
+               static public bool Init (string name, string output, bool want_debugging_support, CompilerContext ctx)
                {
                        FileName = output;
                        AssemblyName an = Assembly.GetAssemblyName (name, output);
@@ -127,11 +114,11 @@ namespace Mono.CSharp {
                        if (an.KeyPair != null) {
                                // If we are going to strong name our assembly make
                                // sure all its refs are strong named
-                               foreach (Assembly a in RootNamespace.Global.Assemblies) {
+                               foreach (Assembly a in GlobalRootNamespace.Instance.Assemblies) {
                                        AssemblyName ref_name = a.GetName ();
                                        byte [] b = ref_name.GetPublicKeyToken ();
                                        if (b == null || b.Length == 0) {
-                                               Report.Error (1577, "Assembly generation failed " +
+                                               ctx.Report.Error (1577, "Assembly generation failed " +
                                                                "-- Referenced assembly '" +
                                                                ref_name.Name +
                                                                "' does not have a strong name.");
@@ -149,7 +136,7 @@ namespace Mono.CSharp {
                        catch (ArgumentException) {
                                // specified key may not be exportable outside it's container
                                if (RootContext.StrongNameKeyContainer != null) {
-                                       Report.Error (1548, "Could not access the key inside the container `" +
+                                       ctx.Report.Error (1548, "Could not access the key inside the container `" +
                                                RootContext.StrongNameKeyContainer + "'.");
                                        Environment.Exit (1);
                                }
@@ -157,17 +144,15 @@ namespace Mono.CSharp {
                        }
                        catch (CryptographicException) {
                                if ((RootContext.StrongNameKeyContainer != null) || (RootContext.StrongNameKeyFile != null)) {
-                                       Report.Error (1548, "Could not use the specified key to strongname the assembly.");
+                                       ctx.Report.Error (1548, "Could not use the specified key to strongname the assembly.");
                                        Environment.Exit (1);
                                }
                                return false;
                        }
 
-#if GMCS_SOURCE
                        // Get the complete AssemblyName from the builder
                        // (We need to get the public key and token)
                        Assembly.Name = Assembly.Builder.GetName ();
-#endif
 
                        //
                        // Pass a path-less name to DefineDynamicModule.  Wonder how
@@ -177,19 +162,53 @@ namespace Mono.CSharp {
                        // If the third argument is true, the ModuleBuilder will dynamically
                        // load the default symbol writer.
                        //
-                       Module.Builder = Assembly.Builder.DefineDynamicModule (
-                               Basename (name), Basename (output), false);
-
-                       if (want_debugging_support)
-                               InitializeSymbolWriter (output);
+                       try {
+                               RootContext.ToplevelTypes.Builder = Assembly.Builder.DefineDynamicModule (
+                                       Basename (name), Basename (output), want_debugging_support);
+
+#if !MS_COMPATIBLE
+                               // TODO: We should use SymbolWriter from DefineDynamicModule
+                               if (want_debugging_support && !SymbolWriter.Initialize (RootContext.ToplevelTypes.Builder, output)) {
+                                       ctx.Report.Error (40, "Unexpected debug information initialization error `{0}'",
+                                               "Could not find the symbol writer assembly (Mono.CompilerServices.SymbolWriter.dll)");
+                                       return false;
+                               }
+#endif
+                       } catch (ExecutionEngineException e) {
+                               ctx.Report.Error (40, "Unexpected debug information initialization error `{0}'",
+                                       e.Message);
+                               return false;
+                       }
 
                        return true;
                }
 
-               static public void Save (string name, bool saveDebugInfo)
+               static public void Save (string name, bool saveDebugInfo, Report Report)
                {
+                       PortableExecutableKinds pekind;
+                       ImageFileMachine machine;
+
+                       switch (RootContext.Platform) {
+                       case Platform.X86:
+                               pekind = PortableExecutableKinds.Required32Bit;
+                               machine = ImageFileMachine.I386;
+                               break;
+                       case Platform.X64:
+                               pekind = PortableExecutableKinds.PE32Plus;
+                               machine = ImageFileMachine.AMD64;
+                               break;
+                       case Platform.IA64:
+                               pekind = PortableExecutableKinds.PE32Plus;
+                               machine = ImageFileMachine.IA64;
+                               break;
+                       case Platform.AnyCPU:
+                       default:
+                               pekind = PortableExecutableKinds.ILOnly;
+                               machine = ImageFileMachine.I386;
+                               break;
+                       }
                        try {
-                               Assembly.Builder.Save (Basename (name));
+                               Assembly.Builder.Save (Basename (name), pekind, machine);
                        }
                        catch (COMException) {
                                if ((RootContext.StrongNameKeyFile == null) || (!RootContext.StrongNameDelaySign))
@@ -208,6 +227,10 @@ namespace Mono.CSharp {
                                Report.Error (16, "Could not write to file `"+name+"', cause: " + ua.Message);
                                return;
                        }
+                       catch (System.NotImplementedException nie) {
+                               Report.RuntimeMissingSupport (Location.Null, nie.Message);
+                               return;
+                       }
 
                        //
                        // Write debuger symbol file
@@ -217,149 +240,32 @@ namespace Mono.CSharp {
                        }
        }
 
-
-       /// <summary>
-       /// An interface to hold all the information needed in the resolving phase.
-       /// </summary>
-       public interface IResolveContext
-       {
-               DeclSpace DeclContainer { get; }
-               bool IsInObsoleteScope { get; }
-               bool IsInUnsafeScope { get; }
-
-               // the declcontainer to lookup for type-parameters.  Should only use LookupGeneric on it.
-               //
-               // FIXME: This is somewhat of a hack.  We don't need a full DeclSpace for this.  We just need the
-               //        current type parameters in scope. IUIC, that will require us to rewrite GenericMethod.
-               //        Maybe we can replace this with a 'LookupGeneric (string)' instead, but we'll have to 
-               //        handle generic method overrides differently
-               DeclSpace GenericDeclContainer { get; }
-       }
-
        /// <summary>
        ///   An Emit Context is created for each body of code (from methods,
        ///   properties bodies, indexer bodies or constructor bodies)
        /// </summary>
-       public class EmitContext : IResolveContext {
-
-               //
-               // Holds a varible used during collection or object initialization.
-               //
-               public Expression CurrentInitializerVariable;
-
-               DeclSpace decl_space;
-               
-               public DeclSpace TypeContainer;
+       public class EmitContext : BuilderContext
+       {
+               // TODO: Has to be private
                public ILGenerator ig;
 
-               [Flags]
-               public enum Flags : int {
-                       /// <summary>
-                       ///   This flag tracks the `checked' state of the compilation,
-                       ///   it controls whether we should generate code that does overflow
-                       ///   checking, or if we generate code that ignores overflows.
-                       ///
-                       ///   The default setting comes from the command line option to generate
-                       ///   checked or unchecked code plus any source code changes using the
-                       ///   checked/unchecked statements or expressions.   Contrast this with
-                       ///   the ConstantCheckState flag.
-                       /// </summary>
-                       CheckState = 1 << 0,
-
-                       /// <summary>
-                       ///   The constant check state is always set to `true' and cant be changed
-                       ///   from the command line.  The source code can change this setting with
-                       ///   the `checked' and `unchecked' statements and expressions. 
-                       /// </summary>
-                       ConstantCheckState = 1 << 1,
-
-                       AllCheckStateFlags = CheckState | ConstantCheckState,
-
-                       /// <summary>
-                       ///  Whether we are inside an unsafe block
-                       /// </summary>
-                       InUnsafe = 1 << 2,
-
-                       InCatch = 1 << 3,
-                       InFinally = 1 << 4,
-
-                       /// <summary>
-                       ///   Whether control flow analysis is enabled
-                       /// </summary>
-                       DoFlowAnalysis = 1 << 5,
-
-                       /// <summary>
-                       ///   Whether control flow analysis is disabled on structs
-                       ///   (only meaningful when DoFlowAnalysis is set)
-                       /// </summary>
-                       OmitStructFlowAnalysis = 1 << 6,
-
-                       ///
-                       /// Indicates the current context is in probing mode, no errors are reported. 
-                       ///
-                       ProbingMode = 1 <<      7,
-
-                       //
-                       // Inside field intializer expression
-                       //
-                       InFieldInitializer = 1 << 8,
-                       
-                       InferReturnType = 1 << 9,
-                       
-                       InCompoundAssignment = 1 << 10,
-
-                       OmitDebuggingInfo = 1 << 11
-               }
-
-               Flags flags;
-
-               /// <summary>
-               ///   Whether we are emitting code inside a static or instance method
-               /// </summary>
-               public bool IsStatic;
-
-               /// <summary>
-               ///   Whether the actual created method is static or instance method.
-               ///   Althoug the method might be declared as `static', if an anonymous
-               ///   method is involved, we might turn this into an instance method.
-               ///
-               ///   So this reflects the low-level staticness of the method, while
-               ///   IsStatic represents the semantic, high-level staticness.
-               /// </summary>
-               //public bool MethodIsStatic;
-
                /// <summary>
                ///   The value that is allowed to be returned or NULL if there is no
                ///   return type.
                /// </summary>
-               Type return_type;
-
-               /// <summary>
-               ///   Points to the Type (extracted from the TypeContainer) that
-               ///   declares this body of code
-               /// </summary>
-               public readonly Type ContainerType;
-               
-               /// <summary>
-               ///   Whether this is generating code for a constructor
-               /// </summary>
-               public bool IsConstructor;
+               TypeSpec return_type;
 
                /// <summary>
                ///   Keeps track of the Type to LocalBuilder temporary storage created
                ///   to store structures (used to compute the address of the structure
                ///   value on structure method invocations)
                /// </summary>
-               public Hashtable temporary_storage;
-
-               public Block CurrentBlock;
-
-               public int CurrentFile;
+               Dictionary<TypeSpec, object> temporary_storage;
 
                /// <summary>
                ///   The location where we store the return value.
                /// </summary>
-               LocalBuilder return_value;
+               public LocalBuilder return_value;
 
                /// <summary>
                ///   The location where return has to jump to return the
@@ -373,549 +279,489 @@ namespace Mono.CSharp {
                public bool HasReturnLabel;
 
                /// <summary>
-               ///  Whether we are in a `fixed' initialization
-               /// </summary>
-               public bool InFixedInitializer;
-
-               /// <summary>
-               ///  Whether we are inside an anonymous method.
-               /// </summary>
-               public AnonymousExpression CurrentAnonymousMethod;
-               
-               /// <summary>
-               ///   Location for this EmitContext
+               ///   Current loop begin and end labels.
                /// </summary>
-               public Location loc;
+               public Label LoopBegin, LoopEnd;
 
                /// <summary>
-               ///   Inside an enum definition, we do not resolve enumeration values
-               ///   to their enumerations, but rather to the underlying type/value
-               ///   This is so EnumVal + EnumValB can be evaluated.
-               ///
-               ///   There is no "E operator + (E x, E y)", so during an enum evaluation
-               ///   we relax the rules
+               ///   Default target in a switch statement.   Only valid if
+               ///   InSwitch is true
                /// </summary>
-               public bool InEnumContext;
-
-               public readonly IResolveContext ResolveContext;
+               public Label DefaultTarget;
 
                /// <summary>
-               ///    The current iterator
+               ///   If this is non-null, points to the current switch statement
                /// </summary>
-               public Iterator CurrentIterator {
-                       get { return CurrentAnonymousMethod as Iterator; }
-               }
+               public Switch Switch;
 
                /// <summary>
-               ///    Whether we are in the resolving stage or not
+               ///  Whether we are inside an anonymous method.
                /// </summary>
-               enum Phase {
-                       Created,
-                       Resolving,
-                       Emitting
-               }
-
-               bool isAnonymousMethodAllowed = true;
-
-               Phase current_phase;
-               FlowBranching current_flow_branching;
-
-               static int next_id = 0;
-               int id = ++next_id;
-
-               public override string ToString ()
-               {
-                       return String.Format ("EmitContext ({0}:{1})", id,
-                                             CurrentAnonymousMethod, loc);
-               }
+               public AnonymousExpression CurrentAnonymousMethod;
                
-               public EmitContext (IResolveContext rc, DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
-                                   Type return_type, int code_flags, bool is_constructor)
+               public readonly IMemberContext MemberContext;
+
+               public EmitContext (IMemberContext rc, ILGenerator ig, TypeSpec return_type)
                {
-                       this.ResolveContext = rc;
+                       this.MemberContext = rc;
                        this.ig = ig;
 
-                       TypeContainer = parent;
-                       this.decl_space = ds;
-                       if (RootContext.Checked)
-                               flags |= Flags.CheckState;
-                       flags |= Flags.ConstantCheckState;
-
-                       if (return_type == null)
-                               throw new ArgumentNullException ("return_type");
-#if GMCS_SOURCE
-                       if ((return_type is TypeBuilder) && return_type.IsGenericTypeDefinition)
-                               throw new InternalErrorException ();
-#endif
-
-                       IsStatic = (code_flags & Modifiers.STATIC) != 0;
-                       ReturnType = return_type;
-                       IsConstructor = is_constructor;
-                       CurrentBlock = null;
-                       CurrentFile = 0;
-                       current_phase = Phase.Created;
-
-                       if (parent != null){
-                               // Can only be null for the ResolveType contexts.
-                               ContainerType = parent.TypeBuilder;
-                               if (rc.IsInUnsafeScope)
-                                       flags |= Flags.InUnsafe;
-                       }
-                       loc = l;
+                       this.return_type = return_type;
                }
 
-               public EmitContext (IResolveContext rc, DeclSpace ds, Location l, ILGenerator ig,
-                                   Type return_type, int code_flags, bool is_constructor)
-                       : this (rc, ds, ds, l, ig, return_type, code_flags, is_constructor)
-               {
-               }
+#region Properties
 
-               public EmitContext (IResolveContext rc, DeclSpace ds, Location l, ILGenerator ig,
-                                   Type return_type, int code_flags)
-                       : this (rc, ds, ds, l, ig, return_type, code_flags, false)
-               {
+               public TypeSpec CurrentType {
+                       get { return MemberContext.CurrentType; }
                }
 
-               // IResolveContext.DeclContainer
-               public DeclSpace DeclContainer { 
-                       get { return decl_space; }
-                       set { decl_space = value; }
+               public TypeParameter[] CurrentTypeParameters {
+                       get { return MemberContext.CurrentTypeParameters; }
                }
 
-               // IResolveContext.GenericDeclContainer
-               public DeclSpace GenericDeclContainer {
-                       get { return DeclContainer; }
+               public MemberCore CurrentTypeDefinition {
+                       get { return MemberContext.CurrentMemberDefinition; }
                }
 
-               public bool CheckState {
-                       get { return (flags & Flags.CheckState) != 0; }
+               public bool IsStatic {
+                       get { return MemberContext.IsStatic; }
                }
 
-               public bool ConstantCheckState {
-                       get { return (flags & Flags.ConstantCheckState) != 0; }
+               bool IsAnonymousStoreyMutateRequired {
+                       get {
+                               return CurrentAnonymousMethod != null &&
+                                       CurrentAnonymousMethod.Storey != null &&
+                                       CurrentAnonymousMethod.Storey.Mutator != null;
+                       }
                }
 
-               public bool InUnsafe {
-                       get { return (flags & Flags.InUnsafe) != 0; }
+               // Has to be used for emitter errors only
+               public Report Report {
+                       get { return MemberContext.Compiler.Report; }
                }
 
-               public bool InCatch {
-                       get { return (flags & Flags.InCatch) != 0; }
+               public TypeSpec ReturnType {
+                       get {
+                               return return_type;
+                       }
                }
+#endregion
 
-               public bool InFinally {
-                       get { return (flags & Flags.InFinally) != 0; }
-               }
+               /// <summary>
+               ///   This is called immediately before emitting an IL opcode to tell the symbol
+               ///   writer to which source line this opcode belongs.
+               /// </summary>
+               public void Mark (Location loc)
+               {
+                       if (!SymbolWriter.HasSymbolWriter || HasSet (Options.OmitDebugInfo) || loc.IsNull)
+                               return;
 
-               public bool DoFlowAnalysis {
-                       get { return (flags & Flags.DoFlowAnalysis) != 0; }
+                       SymbolWriter.MarkSequencePoint (ig, loc);
                }
 
-               public bool OmitStructFlowAnalysis {
-                       get { return (flags & Flags.OmitStructFlowAnalysis) != 0; }
+               public void DefineLocalVariable (string name, LocalBuilder builder)
+               {
+                       SymbolWriter.DefineLocalVariable (name, builder);
                }
 
-               // utility helper for CheckExpr, UnCheckExpr, Checked and Unchecked statements
-               // it's public so that we can use a struct at the callsite
-               public struct FlagsHandle : IDisposable
+               public void BeginCatchBlock (TypeSpec type)
                {
-                       EmitContext ec;
-                       readonly Flags invmask, oldval;
-
-                       public FlagsHandle (EmitContext ec, Flags flagsToSet)
-                               : this (ec, flagsToSet, flagsToSet)
-                       {
-                       }
-
-                       internal FlagsHandle (EmitContext ec, Flags mask, Flags val)
-                       {
-                               this.ec = ec;
-                               invmask = ~mask;
-                               oldval = ec.flags & mask;
-                               ec.flags = (ec.flags & invmask) | (val & mask);
-
-                               if ((mask & Flags.ProbingMode) != 0)
-                                       Report.DisableReporting ();
-                       }
-
-                       public void Dispose ()
-                       {
-                               if ((invmask & Flags.ProbingMode) == 0)
-                                       Report.EnableReporting ();
-
-                               ec.flags = (ec.flags & invmask) | oldval;
-                       }
+                       ig.BeginCatchBlock (type.GetMetaInfo ());
                }
 
-               // Temporarily set all the given flags to the given value.  Should be used in an 'using' statement
-               public FlagsHandle Set (Flags flagsToSet)
+               public void BeginExceptionBlock ()
                {
-                       return new FlagsHandle (this, flagsToSet);
+                       ig.BeginExceptionBlock ();
                }
 
-               public FlagsHandle With (Flags bits, bool enable)
+               public void BeginFinallyBlock ()
                {
-                       return new FlagsHandle (this, bits, enable ? bits : 0);
+                       ig.BeginFinallyBlock ();
                }
 
-               public FlagsHandle WithFlowAnalysis (bool do_flow_analysis, bool omit_struct_analysis)
+               public void BeginScope ()
                {
-                       Flags newflags = 
-                               (do_flow_analysis ? Flags.DoFlowAnalysis : 0) |
-                               (omit_struct_analysis ? Flags.OmitStructFlowAnalysis : 0);
-                       return new FlagsHandle (this, Flags.DoFlowAnalysis | Flags.OmitStructFlowAnalysis, newflags);
-               }
-               
-               /// <summary>
-               ///   If this is true, then Return and ContextualReturn statements
-               ///   will set the ReturnType value based on the expression types
-               ///   of each return statement instead of the method return type
-               ///   (which is initially null).
-               /// </summary>
-               public bool InferReturnType {
-                       get { return (flags & Flags.InferReturnType) != 0; }
+                       ig.BeginScope();
+                       SymbolWriter.OpenScope(ig);
                }
 
-               // IResolveContext.IsInObsoleteScope
-               public bool IsInObsoleteScope {
-                       get {
-                               // Disables obsolete checks when probing is on
-                               return IsInProbingMode || ResolveContext.IsInObsoleteScope;
-                       }
+               public void EndExceptionBlock ()
+               {
+                       ig.EndExceptionBlock ();
                }
 
-               public bool IsInProbingMode {
-                       get { return (flags & Flags.ProbingMode) != 0; }
+               public void EndScope ()
+               {
+                       ig.EndScope();
+                       SymbolWriter.CloseScope(ig);
                }
 
-               // IResolveContext.IsInUnsafeScope
-               public bool IsInUnsafeScope {
-                       get { return InUnsafe || ResolveContext.IsInUnsafeScope; }
-               }
+               public LocalBuilder DeclareLocal (TypeSpec type, bool pinned)
+               {
+                       if (IsAnonymousStoreyMutateRequired)
+                               type = CurrentAnonymousMethod.Storey.Mutator.Mutate (type);
 
-               public bool IsAnonymousMethodAllowed {
-                       get { return isAnonymousMethodAllowed; }
-                       set { isAnonymousMethodAllowed = value; }
+                       return ig.DeclareLocal (type.GetMetaInfo (), pinned);
                }
 
-               public bool IsInFieldInitializer {
-                       get { return (flags & Flags.InFieldInitializer) != 0; }
-               }
-               
-               public bool IsInCompoundAssignment {
-                       get { return (flags & Flags.InCompoundAssignment) != 0; }
+               public Label DefineLabel ()
+               {
+                       return ig.DefineLabel ();
                }
 
-               public bool IsVariableCapturingRequired {
-                       get {
-                               return !IsInProbingMode && (CurrentBranching == null || !CurrentBranching.CurrentUsageVector.IsUnreachable);
-                       }
+               public void MarkLabel (Label label)
+               {
+                       ig.MarkLabel (label);
                }
 
-               public FlowBranching CurrentBranching {
-                       get { return current_flow_branching; }
+               public void Emit (OpCode opcode)
+               {
+                       ig.Emit (opcode);
                }
 
-               public bool OmitDebuggingInfo {
-                       get { return (flags & Flags.OmitDebuggingInfo) != 0; }
-                       set {
-                               if (value)
-                                       flags |= Flags.OmitDebuggingInfo;
-                               else
-                                       flags &= ~Flags.OmitDebuggingInfo;
-                       }
+               public void Emit (OpCode opcode, LocalBuilder local)
+               {
+                       ig.Emit (opcode, local);
                }
 
-               // <summary>
-               //   Starts a new code branching.  This inherits the state of all local
-               //   variables and parameters from the current branching.
-               // </summary>
-               public FlowBranching StartFlowBranching (FlowBranching.BranchingType type, Location loc)
+               public void Emit (OpCode opcode, string arg)
                {
-                       current_flow_branching = FlowBranching.CreateBranching (CurrentBranching, type, null, loc);
-                       return current_flow_branching;
+                       ig.Emit (opcode, arg);
                }
 
-               // <summary>
-               //   Starts a new code branching for block `block'.
-               // </summary>
-               public FlowBranching StartFlowBranching (Block block)
+               public void Emit (OpCode opcode, double arg)
                {
-                       flags |= Flags.DoFlowAnalysis;
+                       ig.Emit (opcode, arg);
+               }
 
-                       current_flow_branching = FlowBranching.CreateBranching (
-                               CurrentBranching, FlowBranching.BranchingType.Block, block, block.StartLocation);
-                       return current_flow_branching;
+               public void Emit (OpCode opcode, float arg)
+               {
+                       ig.Emit (opcode, arg);
                }
 
-               public FlowBranchingTryCatch StartFlowBranching (TryCatch stmt)
+               public void Emit (OpCode opcode, int arg)
                {
-                       FlowBranchingTryCatch branching = new FlowBranchingTryCatch (CurrentBranching, stmt);
-                       current_flow_branching = branching;
-                       return branching;
+                       ig.Emit (opcode, arg);
                }
 
-               public FlowBranchingException StartFlowBranching (ExceptionStatement stmt)
+               public void Emit (OpCode opcode, byte arg)
                {
-                       FlowBranchingException branching = new FlowBranchingException (CurrentBranching, stmt);
-                       current_flow_branching = branching;
-                       return branching;
+                       ig.Emit (opcode, arg);
                }
 
-               public FlowBranchingLabeled StartFlowBranching (LabeledStatement stmt)
+               public void Emit (OpCode opcode, Label label)
                {
-                       FlowBranchingLabeled branching = new FlowBranchingLabeled (CurrentBranching, stmt);
-                       current_flow_branching = branching;
-                       return branching;
+                       ig.Emit (opcode, label);
                }
 
-               public FlowBranchingIterator StartFlowBranching (Iterator iterator)
+               public void Emit (OpCode opcode, Label[] labels)
                {
-                       FlowBranchingIterator branching = new FlowBranchingIterator (CurrentBranching, iterator);
-                       current_flow_branching = branching;
-                       return branching;
+                       ig.Emit (opcode, labels);
                }
 
-               public FlowBranchingToplevel StartFlowBranching (ToplevelBlock stmt)
+               public void Emit (OpCode opcode, TypeSpec type)
                {
-                       FlowBranchingToplevel branching = new FlowBranchingToplevel (CurrentBranching, stmt);
-                       current_flow_branching = branching;
-                       return branching;
+                       if (IsAnonymousStoreyMutateRequired)
+                               type = CurrentAnonymousMethod.Storey.Mutator.Mutate (type);
+
+                       ig.Emit (opcode, type.GetMetaInfo ());
                }
 
-               // <summary>
-               //   Ends a code branching.  Merges the state of locals and parameters
-               //   from all the children of the ending branching.
-               // </summary>
-               public bool EndFlowBranching ()
+               public void Emit (OpCode opcode, FieldSpec field)
                {
-                       FlowBranching old = current_flow_branching;
-                       current_flow_branching = current_flow_branching.Parent;
+                       if (IsAnonymousStoreyMutateRequired)
+                               field = field.Mutate (CurrentAnonymousMethod.Storey.Mutator);
 
-                       FlowBranching.UsageVector vector = current_flow_branching.MergeChild (old);
-                       return vector.IsUnreachable;
+                       ig.Emit (opcode, field.GetMetaInfo ());
                }
 
-               // <summary>
-               //   Kills the current code branching.  This throws away any changed state
-               //   information and should only be used in case of an error.
-               // </summary>
-               // FIXME: this is evil
-               public void KillFlowBranching ()
+               public void Emit (OpCode opcode, MethodSpec method)
                {
-                       current_flow_branching = current_flow_branching.Parent;
+                       if (IsAnonymousStoreyMutateRequired)
+                               method = method.Mutate (CurrentAnonymousMethod.Storey.Mutator);
+
+                       if (method.IsConstructor)
+                               ig.Emit (opcode, (ConstructorInfo) method.GetMetaInfo ());
+                       else
+                               ig.Emit (opcode, (MethodInfo) method.GetMetaInfo ());
                }
 
-               public bool MustCaptureVariable (LocalInfo local)
+               // TODO: REMOVE breaks mutator
+               public void Emit (OpCode opcode, MethodInfo method)
                {
-                       if (CurrentAnonymousMethod == null)
-                               return false;
+                       ig.Emit (opcode, method);
+               }
 
-                       // FIXME: IsIterator is too aggressive, we should capture only if child
-                       // block contains yield
-                       if (CurrentAnonymousMethod.IsIterator)
-                               return true;
+               // TODO: REMOVE breaks mutator
+               public void Emit (OpCode opcode, FieldBuilder field)
+               {
+                       ig.Emit (opcode, field);
+               }
 
-                       return local.Block.Toplevel != CurrentBlock.Toplevel;
+               public void Emit (OpCode opcode, MethodSpec method, Type[] vargs)
+               {
+                       // TODO MemberCache: This should mutate too
+                       ig.EmitCall (opcode, (MethodInfo) method.GetMetaInfo (), vargs);
                }
-               
-               public void EmitMeta (ToplevelBlock b)
+
+               public void EmitArrayNew (ArrayContainer ac)
                {
-                       b.EmitMeta (this);
+                       if (ac.Rank == 1) {
+                               Emit (OpCodes.Newarr, ac.Element);
+                       } else {
+                               if (IsAnonymousStoreyMutateRequired)
+                                       ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
 
-                       if (HasReturnLabel)
-                               ReturnLabel = ig.DefineLabel ();
+                               ig.Emit (OpCodes.Newobj, ac.GetConstructor ());
+                       }
                }
 
                //
-               // Here until we can fix the problem with Mono.CSharp.Switch, which
-               // currently can not cope with ig == null during resolve (which must
-               // be fixed for switch statements to work on anonymous methods).
+               // Emits the right opcode to load from an array
                //
-               public void EmitTopBlock (IMethodData md, ToplevelBlock block)
+               public void EmitArrayLoad (ArrayContainer ac)
                {
-                       if (block == null)
-                               return;
-                       
-                       bool unreachable;
-                       
-                       if (ResolveTopBlock (null, block, md.ParameterInfo, md, out unreachable)){
-                               if (Report.Errors > 0)
-                                       return;
-
-                               EmitMeta (block);
+                       if (ac.Rank > 1) {
+                               if (IsAnonymousStoreyMutateRequired)
+                                       ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
 
-                               current_phase = Phase.Emitting;
-#if PRODUCTION
-                               try {
-#endif
-                               EmitResolvedTopBlock (block, unreachable);
-#if PRODUCTION
-                               } catch (Exception e){
-                                       Console.WriteLine ("Exception caught by the compiler while emitting:");
-                                       Console.WriteLine ("   Block that caused the problem begin at: " + block.loc);
-                                       
-                                       Console.WriteLine (e.GetType ().FullName + ": " + e.Message);
-                                       throw;
-                               }
-#endif
+                               ig.Emit (OpCodes.Call, ac.GetGetMethod ());
+                               return;
                        }
-               }
 
-               bool resolved;
-               bool unreachable;
+                       var type = ac.Element;
+                       if (TypeManager.IsEnumType (type))
+                               type = EnumSpec.GetUnderlyingType (type);
+
+                       if (type == TypeManager.byte_type || type == TypeManager.bool_type)
+                               Emit (OpCodes.Ldelem_U1);
+                       else if (type == TypeManager.sbyte_type)
+                               Emit (OpCodes.Ldelem_I1);
+                       else if (type == TypeManager.short_type)
+                               Emit (OpCodes.Ldelem_I2);
+                       else if (type == TypeManager.ushort_type || type == TypeManager.char_type)
+                               Emit (OpCodes.Ldelem_U2);
+                       else if (type == TypeManager.int32_type)
+                               Emit (OpCodes.Ldelem_I4);
+                       else if (type == TypeManager.uint32_type)
+                               Emit (OpCodes.Ldelem_U4);
+                       else if (type == TypeManager.uint64_type)
+                               Emit (OpCodes.Ldelem_I8);
+                       else if (type == TypeManager.int64_type)
+                               Emit (OpCodes.Ldelem_I8);
+                       else if (type == TypeManager.float_type)
+                               Emit (OpCodes.Ldelem_R4);
+                       else if (type == TypeManager.double_type)
+                               Emit (OpCodes.Ldelem_R8);
+                       else if (type == TypeManager.intptr_type)
+                               Emit (OpCodes.Ldelem_I);
+                       else if (TypeManager.IsStruct (type)) {
+                               Emit (OpCodes.Ldelema, type);
+                               Emit (OpCodes.Ldobj, type);
+                       } else if (type.IsGenericParameter) {
+                               Emit (OpCodes.Ldelem, type);
+                       } else if (type.IsPointer)
+                               Emit (OpCodes.Ldelem_I);
+                       else
+                               Emit (OpCodes.Ldelem_Ref);
+               }
 
-               public bool ResolveTopBlock (EmitContext anonymous_method_host, ToplevelBlock block,
-                                            Parameters ip, IMethodData md, out bool unreachable)
+               //
+               // Emits the right opcode to store to an array
+               //
+               public void EmitArrayStore (ArrayContainer ac)
                {
-                       if (resolved) {
-                               unreachable = this.unreachable;
-                               return true;
-                       }
+                       if (ac.Rank > 1) {
+                               if (IsAnonymousStoreyMutateRequired)
+                                       ac = (ArrayContainer) ac.Mutate (CurrentAnonymousMethod.Storey.Mutator);
 
-                       current_phase = Phase.Resolving;
-                       unreachable = false;
-
-                       if (!loc.IsNull)
-                               CurrentFile = loc.File;
+                               ig.Emit (OpCodes.Call, ac.GetSetMethod ());
+                               return;
+                       }
 
-#if PRODUCTION
-                       try {
-#endif
-                               if (!block.ResolveMeta (this, ip))
-                                       return false;
+                       var type = ac.Element;
+
+                       if (type.IsEnum)
+                               type = EnumSpec.GetUnderlyingType (type);
+
+                       if (type == TypeManager.byte_type || type == TypeManager.sbyte_type || type == TypeManager.bool_type)
+                               Emit (OpCodes.Stelem_I1);
+                       else if (type == TypeManager.short_type || type == TypeManager.ushort_type || type == TypeManager.char_type)
+                               Emit (OpCodes.Stelem_I2);
+                       else if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+                               Emit (OpCodes.Stelem_I4);
+                       else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+                               Emit (OpCodes.Stelem_I8);
+                       else if (type == TypeManager.float_type)
+                               Emit (OpCodes.Stelem_R4);
+                       else if (type == TypeManager.double_type)
+                               Emit (OpCodes.Stelem_R8);
+                       else if (type == TypeManager.intptr_type)
+                               Emit (OpCodes.Stobj, type);
+                       else if (TypeManager.IsStruct (type))
+                               Emit (OpCodes.Stobj, type);
+                       else if (type.IsGenericParameter)
+                               Emit (OpCodes.Stelem, type);
+                       else if (type.IsPointer)
+                               Emit (OpCodes.Stelem_I);
+                       else
+                               Emit (OpCodes.Stelem_Ref);
+               }
 
-                               using (this.With (EmitContext.Flags.DoFlowAnalysis, true)) {
-                                       FlowBranchingToplevel top_level;
-                                       if (anonymous_method_host != null)
-                                               top_level = new FlowBranchingToplevel (anonymous_method_host.CurrentBranching, block);
-                                       else 
-                                               top_level = block.TopLevelBranching;
+               public void EmitInt (int i)
+               {
+                       switch (i) {
+                       case -1:
+                               ig.Emit (OpCodes.Ldc_I4_M1);
+                               break;
 
-                                       current_flow_branching = top_level;
-                                       bool ok = block.Resolve (this);
-                                       current_flow_branching = null;
+                       case 0:
+                               ig.Emit (OpCodes.Ldc_I4_0);
+                               break;
 
-                                       if (!ok)
-                                               return false;
+                       case 1:
+                               ig.Emit (OpCodes.Ldc_I4_1);
+                               break;
 
-                                       bool flow_unreachable = top_level.End ();
-                                       if (flow_unreachable)
-                                               this.unreachable = unreachable = true;
-                               }
-#if PRODUCTION
-                       } catch (Exception e) {
-                               Console.WriteLine ("Exception caught by the compiler while compiling:");
-                               Console.WriteLine ("   Block that caused the problem begin at: " + loc);
-
-                               if (CurrentBlock != null){
-                                       Console.WriteLine ("                     Block being compiled: [{0},{1}]",
-                                                          CurrentBlock.StartLocation, CurrentBlock.EndLocation);
-                               }
-                               Console.WriteLine (e.GetType ().FullName + ": " + e.Message);
-                               throw;
-                       }
-#endif
+                       case 2:
+                               ig.Emit (OpCodes.Ldc_I4_2);
+                               break;
 
-                       if (return_type != TypeManager.void_type && !unreachable) {
-                               if (CurrentAnonymousMethod == null) {
-                                       Report.Error (161, md.Location, "`{0}': not all code paths return a value", md.GetSignatureForError ());
-                                       return false;
-                               } else if (!CurrentAnonymousMethod.IsIterator) {
-                                       Report.Error (1643, CurrentAnonymousMethod.Location, "Not all code paths return a value in anonymous method of type `{0}'",
-                                                     CurrentAnonymousMethod.GetSignatureForError ());
-                                       return false;
-                               }
-                       }
+                       case 3:
+                               ig.Emit (OpCodes.Ldc_I4_3);
+                               break;
 
-                       resolved = true;
-                       return true;
-               }
+                       case 4:
+                               ig.Emit (OpCodes.Ldc_I4_4);
+                               break;
 
-               public Type ReturnType {
-                       set {
-                               return_type = value;
-                       }
-                       get {
-                               return return_type;
-                       }
-               }
+                       case 5:
+                               ig.Emit (OpCodes.Ldc_I4_5);
+                               break;
 
-               public void EmitResolvedTopBlock (ToplevelBlock block, bool unreachable)
-               {
-                       if (block != null)
-                               block.Emit (this);
+                       case 6:
+                               ig.Emit (OpCodes.Ldc_I4_6);
+                               break;
 
-                       if (HasReturnLabel)
-                               ig.MarkLabel (ReturnLabel);
+                       case 7:
+                               ig.Emit (OpCodes.Ldc_I4_7);
+                               break;
 
-                       if (return_value != null){
-                               ig.Emit (OpCodes.Ldloc, return_value);
-                               ig.Emit (OpCodes.Ret);
-                       } else {
-                               //
-                               // If `HasReturnLabel' is set, then we already emitted a
-                               // jump to the end of the method, so we must emit a `ret'
-                               // there.
-                               //
-                               // Unfortunately, System.Reflection.Emit automatically emits
-                               // a leave to the end of a finally block.  This is a problem
-                               // if no code is following the try/finally block since we may
-                               // jump to a point after the end of the method.
-                               // As a workaround, we're always creating a return label in
-                               // this case.
-                               //
+                       case 8:
+                               ig.Emit (OpCodes.Ldc_I4_8);
+                               break;
 
-                               if ((block != null) && block.IsDestructor) {
-                                       // Nothing to do; S.R.E automatically emits a leave.
-                               } else if (HasReturnLabel || !unreachable) {
-                                       if (return_type != TypeManager.void_type)
-                                               ig.Emit (OpCodes.Ldloc, TemporaryReturn ());
-                                       ig.Emit (OpCodes.Ret);
-                               }
+                       default:
+                               if (i >= -128 && i <= 127) {
+                                       ig.Emit (OpCodes.Ldc_I4_S, (sbyte) i);
+                               } else
+                                       ig.Emit (OpCodes.Ldc_I4, i);
+                               break;
                        }
                }
 
-               /// <summary>
-               ///   This is called immediately before emitting an IL opcode to tell the symbol
-               ///   writer to which source line this opcode belongs.
-               /// </summary>
-               public void Mark (Location loc)
+               public void EmitLong (long l)
                {
-                       if (!SymbolWriter.HasSymbolWriter || OmitDebuggingInfo || loc.IsNull)
+                       if (l >= int.MinValue && l <= int.MaxValue) {
+                               EmitInt (unchecked ((int) l));
+                               ig.Emit (OpCodes.Conv_I8);
                                return;
+                       }
 
-                       SymbolWriter.MarkSequencePoint (ig, loc);
-               }
+                       if (l >= 0 && l <= uint.MaxValue) {
+                               EmitInt (unchecked ((int) l));
+                               ig.Emit (OpCodes.Conv_U8);
+                               return;
+                       }
 
-               public void DefineLocalVariable (string name, LocalBuilder builder)
-               {
-                       SymbolWriter.DefineLocalVariable (name, builder);
+                       ig.Emit (OpCodes.Ldc_I8, l);
                }
 
-               public void BeginScope ()
+               //
+               // Load the object from the pointer.  
+               //
+               public void EmitLoadFromPtr (TypeSpec t)
                {
-                       ig.BeginScope();
-                       SymbolWriter.OpenScope(ig);
+                       if (t == TypeManager.int32_type)
+                               ig.Emit (OpCodes.Ldind_I4);
+                       else if (t == TypeManager.uint32_type)
+                               ig.Emit (OpCodes.Ldind_U4);
+                       else if (t == TypeManager.short_type)
+                               ig.Emit (OpCodes.Ldind_I2);
+                       else if (t == TypeManager.ushort_type)
+                               ig.Emit (OpCodes.Ldind_U2);
+                       else if (t == TypeManager.char_type)
+                               ig.Emit (OpCodes.Ldind_U2);
+                       else if (t == TypeManager.byte_type)
+                               ig.Emit (OpCodes.Ldind_U1);
+                       else if (t == TypeManager.sbyte_type)
+                               ig.Emit (OpCodes.Ldind_I1);
+                       else if (t == TypeManager.uint64_type)
+                               ig.Emit (OpCodes.Ldind_I8);
+                       else if (t == TypeManager.int64_type)
+                               ig.Emit (OpCodes.Ldind_I8);
+                       else if (t == TypeManager.float_type)
+                               ig.Emit (OpCodes.Ldind_R4);
+                       else if (t == TypeManager.double_type)
+                               ig.Emit (OpCodes.Ldind_R8);
+                       else if (t == TypeManager.bool_type)
+                               ig.Emit (OpCodes.Ldind_I1);
+                       else if (t == TypeManager.intptr_type)
+                               ig.Emit (OpCodes.Ldind_I);
+                       else if (t.IsEnum) {
+                               if (t == TypeManager.enum_type)
+                                       ig.Emit (OpCodes.Ldind_Ref);
+                               else
+                                       EmitLoadFromPtr (EnumSpec.GetUnderlyingType (t));
+                       } else if (TypeManager.IsStruct (t) || TypeManager.IsGenericParameter (t))
+                               Emit (OpCodes.Ldobj, t);
+                       else if (t.IsPointer)
+                               ig.Emit (OpCodes.Ldind_I);
+                       else
+                               ig.Emit (OpCodes.Ldind_Ref);
                }
 
-               public void EndScope ()
+               //
+               // The stack contains the pointer and the value of type `type'
+               //
+               public void EmitStoreFromPtr (TypeSpec type)
                {
-                       ig.EndScope();
-                       SymbolWriter.CloseScope(ig);
+                       if (type.IsEnum)
+                               type = EnumSpec.GetUnderlyingType (type);
+
+                       if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+                               ig.Emit (OpCodes.Stind_I4);
+                       else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+                               ig.Emit (OpCodes.Stind_I8);
+                       else if (type == TypeManager.char_type || type == TypeManager.short_type ||
+                                type == TypeManager.ushort_type)
+                               ig.Emit (OpCodes.Stind_I2);
+                       else if (type == TypeManager.float_type)
+                               ig.Emit (OpCodes.Stind_R4);
+                       else if (type == TypeManager.double_type)
+                               ig.Emit (OpCodes.Stind_R8);
+                       else if (type == TypeManager.byte_type || type == TypeManager.sbyte_type ||
+                                type == TypeManager.bool_type)
+                               ig.Emit (OpCodes.Stind_I1);
+                       else if (type == TypeManager.intptr_type)
+                               ig.Emit (OpCodes.Stind_I);
+                       else if (TypeManager.IsStruct (type) || TypeManager.IsGenericParameter (type))
+                               ig.Emit (OpCodes.Stobj, type.GetMetaInfo ());
+                       else
+                               ig.Emit (OpCodes.Stind_Ref);
                }
 
                /// <summary>
                ///   Returns a temporary storage for a variable of type t as 
                ///   a local variable in the current body.
                /// </summary>
-               public LocalBuilder GetTemporaryLocal (Type t)
+               public LocalBuilder GetTemporaryLocal (TypeSpec t)
                {
                        if (temporary_storage != null) {
-                               object o = temporary_storage [t];
-                               if (o != null) {
-                                       if (o is Stack) {
-                                               Stack s = (Stack) o;
+                               object o;
+                               if (temporary_storage.TryGetValue (t, out o)) {
+                                       if (o is Stack<LocalBuilder>) {
+                                               var s = (Stack<LocalBuilder>) o;
                                                o = s.Count == 0 ? null : s.Pop ();
                                        } else {
                                                temporary_storage.Remove (t);
@@ -924,46 +770,31 @@ namespace Mono.CSharp {
                                if (o != null)
                                        return (LocalBuilder) o;
                        }
-                       return ig.DeclareLocal (t);
+                       return DeclareLocal (t, false);
                }
 
-               public void FreeTemporaryLocal (LocalBuilder b, Type t)
+               public void FreeTemporaryLocal (LocalBuilder b, TypeSpec t)
                {
                        if (temporary_storage == null) {
-                               temporary_storage = new Hashtable ();
-                               temporary_storage [t] = b;
+                               temporary_storage = new Dictionary<TypeSpec, object> (ReferenceEquality<TypeSpec>.Default);
+                               temporary_storage.Add (t, b);
                                return;
                        }
-                       object o = temporary_storage [t];
-                       if (o == null) {
-                               temporary_storage [t] = b;
+                       object o;
+                       
+                       if (!temporary_storage.TryGetValue (t, out o)) {
+                               temporary_storage.Add (t, b);
                                return;
                        }
-                       Stack s = o as Stack;
+                       var s = o as Stack<LocalBuilder>;
                        if (s == null) {
-                               s = new Stack ();
-                               s.Push (o);
+                               s = new Stack<LocalBuilder> ();
+                               s.Push ((LocalBuilder)o);
                                temporary_storage [t] = s;
                        }
                        s.Push (b);
                }
 
-               /// <summary>
-               ///   Current loop begin and end labels.
-               /// </summary>
-               public Label LoopBegin, LoopEnd;
-
-               /// <summary>
-               ///   Default target in a switch statement.   Only valid if
-               ///   InSwitch is true
-               /// </summary>
-               public Label DefaultTarget;
-
-               /// <summary>
-               ///   If this is non-null, points to the current switch statement
-               /// </summary>
-               public Switch Switch;
-
                /// <summary>
                ///   ReturnValue creates on demand the LocalBuilder for the
                ///   return value from the function.  By default this is not
@@ -979,62 +810,23 @@ namespace Mono.CSharp {
                public LocalBuilder TemporaryReturn ()
                {
                        if (return_value == null){
-                               return_value = ig.DeclareLocal (return_type);
+                               return_value = DeclareLocal (return_type, false);
                                if (!HasReturnLabel){
-                                       ReturnLabel = ig.DefineLabel ();
+                                       ReturnLabel = DefineLabel ();
                                        HasReturnLabel = true;
                                }
                        }
 
                        return return_value;
                }
-
-               /// <summary>
-               ///   This method is used during the Resolution phase to flag the
-               ///   need to define the ReturnLabel
-               /// </summary>
-               public void NeedReturnLabel ()
-               {
-                       if (current_phase != Phase.Resolving){
-                               //
-                               // The reason is that the `ReturnLabel' is declared between
-                               // resolution and emission
-                               // 
-                               throw new Exception ("NeedReturnLabel called from Emit phase, should only be called during Resolve");
-                       }
-                       
-                       if (!HasReturnLabel)
-                               HasReturnLabel = true;
-               }
-
-
-               public Expression GetThis (Location loc)
-               {
-                       This my_this;
-                       if (CurrentBlock != null)
-                               my_this = new This (CurrentBlock, loc);
-                       else
-                               my_this = new This (loc);
-
-                       if (!my_this.ResolveBase (this))
-                               my_this = null;
-
-                       return my_this;
-               }
        }
 
-
-       public abstract class CommonAssemblyModulClass : Attributable, IResolveContext {
-
-               protected CommonAssemblyModulClass ():
-                       base (null)
-               {
-               }
-
-               public void AddAttributes (ArrayList attrs)
+       public abstract class CommonAssemblyModulClass : Attributable, IMemberContext
+       {
+               public void AddAttributes (List<Attribute> attrs, IMemberContext context)
                {
                        foreach (Attribute a in attrs)
-                               a.AttachTo (this);
+                               a.AttachTo (this, context);
 
                        if (attributes == null) {
                                attributes = new Attributes (attrs);
@@ -1051,7 +843,7 @@ namespace Mono.CSharp {
                        OptAttributes.Emit ();
                }
 
-               protected Attribute ResolveAttribute (Type a_type)
+               protected Attribute ResolveAttribute (PredefinedAttribute a_type)
                {
                        Attribute a = OptAttributes.Search (a_type);
                        if (a != null) {
@@ -1060,28 +852,60 @@ namespace Mono.CSharp {
                        return a;
                }
 
-               public override IResolveContext ResolveContext {
-                       get { return this; }
+               #region IMemberContext Members
+
+               public CompilerContext Compiler {
+                       get { return RootContext.ToplevelTypes.Compiler; }
+               }
+
+               public TypeSpec CurrentType {
+                       get { return null; }
                }
 
-               #region IResolveContext Members
+               public TypeParameter[] CurrentTypeParameters {
+                       get { return null; }
+               }
 
-               public DeclSpace DeclContainer {
+               public MemberCore CurrentMemberDefinition {
                        get { return RootContext.ToplevelTypes; }
                }
 
-               public DeclSpace GenericDeclContainer {
-                       get { return DeclContainer; }
+               public string GetSignatureForError ()
+               {
+                       return "<module>";
+               }
+
+               public bool HasUnresolvedConstraints {
+                       get { return false; }
+               }
+
+               public bool IsObsolete {
+                       get { return false; }
                }
 
-               public bool IsInObsoleteScope {
+               public bool IsUnsafe {
                        get { return false; }
                }
 
-               public bool IsInUnsafeScope {
+               public bool IsStatic {
                        get { return false; }
                }
 
+               public ExtensionMethodGroupExpr LookupExtensionMethod (TypeSpec extensionType, string name, int arity, Location loc)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               public FullNamedExpression LookupNamespaceOrType (string name, int arity, Location loc, bool ignore_cs0104)
+               {
+                       return RootContext.ToplevelTypes.LookupNamespaceOrType (name, arity, loc, ignore_cs0104);
+               }
+
+               public FullNamedExpression LookupNamespaceAlias (string name)
+               {
+                       return null;
+               }
+
                #endregion
        }
                 
@@ -1090,33 +914,26 @@ namespace Mono.CSharp {
                public AssemblyBuilder Builder;
                bool is_cls_compliant;
                bool wrap_non_exception_throws;
-               Type runtime_compatibility_attr_type;
 
                public Attribute ClsCompliantAttribute;
 
-               ListDictionary declarative_security;
-#if GMCS_SOURCE
+               Dictionary<SecurityAction, PermissionSet> declarative_security;
                bool has_extension_method;              
                public AssemblyName Name;
                MethodInfo add_type_forwarder;
-               ListDictionary emitted_forwarders;
-#endif
+               Dictionary<ITypeDefinition, Attribute> emitted_forwarders;
 
                // Module is here just because of error messages
                static string[] attribute_targets = new string [] { "assembly", "module" };
 
-               public AssemblyClass (): base ()
+               public AssemblyClass ()
                {
-#if GMCS_SOURCE
                        wrap_non_exception_throws = true;
-#endif
                }
 
                public bool HasExtensionMethods {
                        set {
-#if GMCS_SOURCE                                
                                has_extension_method = value;
-#endif
                        }
                }
 
@@ -1143,10 +960,39 @@ namespace Mono.CSharp {
                        return is_cls_compliant;
                }
 
+               Report Report {
+                       get { return Compiler.Report; }
+               }
+
                public void Resolve ()
                {
-                       runtime_compatibility_attr_type = TypeManager.CoreLookupType (
-                               "System.Runtime.CompilerServices", "RuntimeCompatibilityAttribute", Kind.Class, false);
+                       if (RootContext.Unsafe) {
+                               //
+                               // Emits [assembly: SecurityPermissionAttribute (SecurityAction.RequestMinimum, SkipVerification = true)]
+                               // when -unsafe option was specified
+                               //
+                               
+                               Location loc = Location.Null;
+
+                               MemberAccess system_security_permissions = new MemberAccess (new MemberAccess (
+                                       new QualifiedAliasMember (QualifiedAliasMember.GlobalAlias, "System", loc), "Security", loc), "Permissions", loc);
+
+                               Arguments pos = new Arguments (1);
+                               pos.Add (new Argument (new MemberAccess (new MemberAccess (system_security_permissions, "SecurityAction", loc), "RequestMinimum")));
+
+                               Arguments named = new Arguments (1);
+                               named.Add (new NamedArgument ("SkipVerification", loc, new BoolLiteral (true, loc)));
+
+                               GlobalAttribute g = new GlobalAttribute (new NamespaceEntry (null, null, null), "assembly",
+                                       new MemberAccess (system_security_permissions, "SecurityPermissionAttribute"),
+                                       new Arguments[] { pos, named }, loc, false);
+                               g.AttachTo (this, this);
+
+                               if (g.Resolve () != null) {
+                                       declarative_security = new Dictionary<SecurityAction, PermissionSet> ();
+                                       g.ExtractSecurityPermissionSet (declarative_security);
+                               }
+                       }
 
                        if (OptAttributes == null)
                                return;
@@ -1155,20 +1001,17 @@ namespace Mono.CSharp {
                        if (!OptAttributes.CheckTargets())
                                return;
 
-                       if (TypeManager.cls_compliant_attribute_type != null)
-                               ClsCompliantAttribute = ResolveAttribute (TypeManager.cls_compliant_attribute_type);
+                       ClsCompliantAttribute = ResolveAttribute (PredefinedAttributes.Get.CLSCompliant);
 
                        if (ClsCompliantAttribute != null) {
                                is_cls_compliant = ClsCompliantAttribute.GetClsCompliantAttributeValue ();
                        }
 
-                       if (runtime_compatibility_attr_type != null) {
-                               Attribute a = ResolveAttribute (runtime_compatibility_attr_type);
-                               if (a != null) {
-                                       object val = a.GetPropertyValue ("WrapNonExceptionThrows");
-                                       if (val != null)
-                                               wrap_non_exception_throws = (bool) val;
-                               }
+                       Attribute a = ResolveAttribute (PredefinedAttributes.Get.RuntimeCompatibility);
+                       if (a != null) {
+                               var val = a.GetPropertyValue ("WrapNonExceptionThrows") as BoolConstant;
+                               if (val != null)
+                                       wrap_non_exception_throws = val.Value;
                        }
                }
 
@@ -1216,43 +1059,41 @@ namespace Mono.CSharp {
                                        //       are loaded yet.
                                        // TODO: Does not handle quoted attributes properly
                                        switch (a.Name) {
-                                               case "AssemblyKeyFile":
-                                               case "AssemblyKeyFileAttribute":
-                                               case "System.Reflection.AssemblyKeyFileAttribute":
-                                                       if (RootContext.StrongNameKeyFile != null) {
-                                                               Report.SymbolRelatedToPreviousError (a.Location, a.Name);
-                                                               Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
-                                    "keyfile", "System.Reflection.AssemblyKeyFileAttribute");
-                                                       }
-                                                       else {
-                                                               string value = a.GetString ();
-                                                               if (value.Length != 0)
-                                                                       RootContext.StrongNameKeyFile = value;
-                                                       }
-                                                       break;
-                                               case "AssemblyKeyName":
-                                               case "AssemblyKeyNameAttribute":
-                                               case "System.Reflection.AssemblyKeyNameAttribute":
-                                                       if (RootContext.StrongNameKeyContainer != null) {
-                                                               Report.SymbolRelatedToPreviousError (a.Location, a.Name);
-                                                               Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
+                                       case "AssemblyKeyFile":
+                                       case "AssemblyKeyFileAttribute":
+                                       case "System.Reflection.AssemblyKeyFileAttribute":
+                                               if (RootContext.StrongNameKeyFile != null) {
+                                                       Report.SymbolRelatedToPreviousError (a.Location, a.GetSignatureForError ());
+                                                       Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
+                                                                       "keyfile", "System.Reflection.AssemblyKeyFileAttribute");
+                                               } else {
+                                                       string value = a.GetString ();
+                                                       if (value != null && value.Length != 0)
+                                                               RootContext.StrongNameKeyFile = value;
+                                               }
+                                               break;
+                                       case "AssemblyKeyName":
+                                       case "AssemblyKeyNameAttribute":
+                                       case "System.Reflection.AssemblyKeyNameAttribute":
+                                               if (RootContext.StrongNameKeyContainer != null) {
+                                                       Report.SymbolRelatedToPreviousError (a.Location, a.GetSignatureForError ());
+                                                       Report.Warning (1616, 1, "Option `{0}' overrides attribute `{1}' given in a source file or added module",
                                                                        "keycontainer", "System.Reflection.AssemblyKeyNameAttribute");
-                                                       }
-                                                       else {
-                                                               string value = a.GetString ();
-                                                               if (value.Length != 0)
-                                                                       RootContext.StrongNameKeyContainer = value;
-                                                       }
-                                                       break;
-                                               case "AssemblyDelaySign":
-                                               case "AssemblyDelaySignAttribute":
-                                               case "System.Reflection.AssemblyDelaySignAttribute":
-                                                       RootContext.StrongNameDelaySign = a.GetBoolean ();
-                                                       break;
+                                               } else {
+                                                       string value = a.GetString ();
+                                                       if (value != null && value.Length != 0)
+                                                               RootContext.StrongNameKeyContainer = value;
+                                               }
+                                               break;
+                                       case "AssemblyDelaySign":
+                                       case "AssemblyDelaySignAttribute":
+                                       case "System.Reflection.AssemblyDelaySignAttribute":
+                                               RootContext.StrongNameDelaySign = a.GetBoolean ();
+                                               break;
                                        }
                                }
                        }
-
+                       
                        AssemblyName an = new AssemblyName ();
                        an.Name = Path.GetFileNameWithoutExtension (name);
 
@@ -1322,7 +1163,6 @@ namespace Mono.CSharp {
                        Report.Error (1548, "Error during assembly signing. " + text);
                }
 
-#if GMCS_SOURCE
                bool CheckInternalsVisibleAttribute (Attribute a)
                {
                        string assembly_name = a.GetString ();
@@ -1351,7 +1191,6 @@ namespace Mono.CSharp {
 
                        return true;
                }
-#endif
 
                static bool IsValidAssemblyVersion (string version)
                {
@@ -1375,17 +1214,17 @@ namespace Mono.CSharp {
                        return true;
                }
 
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder customBuilder)
+               public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.IsValidSecurityAttribute ()) {
                                if (declarative_security == null)
-                                       declarative_security = new ListDictionary ();
+                                       declarative_security = new Dictionary<SecurityAction, PermissionSet> ();
 
                                a.ExtractSecurityPermissionSet (declarative_security);
                                return;
                        }
 
-                       if (a.Type == TypeManager.assembly_culture_attribute_type) {
+                       if (a.Type == pa.AssemblyCulture) {
                                string value = a.GetString ();
                                if (value == null || value.Length == 0)
                                        return;
@@ -1396,7 +1235,7 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       if (a.Type == TypeManager.assembly_version_attribute_type) {
+                       if (a.Type == pa.AssemblyVersion) {
                                string value = a.GetString ();
                                if (value == null || value.Length == 0)
                                        return;
@@ -1409,29 +1248,28 @@ namespace Mono.CSharp {
                                }
                        }
 
-#if GMCS_SOURCE
-                       if (a.Type == TypeManager.internals_visible_attr_type && !CheckInternalsVisibleAttribute (a))
+                       if (a.Type == pa.InternalsVisibleTo && !CheckInternalsVisibleAttribute (a))
                                return;
 
-                       if (a.Type == TypeManager.type_forwarder_attr_type) {
-                               Type t = a.GetArgumentType ();
+                       if (a.Type == pa.TypeForwarder) {
+                               TypeSpec t = a.GetArgumentType ();
                                if (t == null || TypeManager.HasElementType (t)) {
                                        Report.Error (735, a.Location, "Invalid type specified as an argument for TypeForwardedTo attribute");
                                        return;
                                }
 
                                if (emitted_forwarders == null) {
-                                       emitted_forwarders = new ListDictionary();
-                               } else if (emitted_forwarders.Contains(t)) {
-                                       Report.SymbolRelatedToPreviousError(((Attribute)emitted_forwarders[t]).Location, null);
+                                       emitted_forwarders = new Dictionary<ITypeDefinition, Attribute>  ();
+                               } else if (emitted_forwarders.ContainsKey (t.MemberDefinition)) {
+                                       Report.SymbolRelatedToPreviousError(emitted_forwarders[t.MemberDefinition].Location, null);
                                        Report.Error(739, a.Location, "A duplicate type forward of type `{0}'",
                                                TypeManager.CSharpName(t));
                                        return;
                                }
 
-                               emitted_forwarders.Add(t, a);
+                               emitted_forwarders.Add(t.MemberDefinition, a);
 
-                               if (TypeManager.LookupDeclSpace (t) != null) {
+                               if (t.Assembly == Builder) {
                                        Report.SymbolRelatedToPreviousError (t);
                                        Report.Error (729, a.Location, "Cannot forward type `{0}' because it is defined in this assembly",
                                                TypeManager.CSharpName (t));
@@ -1444,11 +1282,6 @@ namespace Mono.CSharp {
                                        return;
                                }
 
-                               if (t.IsGenericType) {
-                                       Report.Error (733, a.Location, "Cannot forward generic type `{0}'", TypeManager.CSharpName (t));
-                                       return;
-                               }
-
                                if (add_type_forwarder == null) {
                                        add_type_forwarder = typeof (AssemblyBuilder).GetMethod ("AddTypeForwarder",
                                                BindingFlags.NonPublic | BindingFlags.Instance);
@@ -1459,39 +1292,35 @@ namespace Mono.CSharp {
                                        }
                                }
 
-                               add_type_forwarder.Invoke (Builder, new object[] { t });
+                               add_type_forwarder.Invoke (Builder, new object[] { t.GetMetaInfo () });
                                return;
                        }
                        
-                       if (a.Type == TypeManager.extension_attribute_type) {
+                       if (a.Type == pa.Extension) {
                                a.Error_MisusedExtensionAttribute ();
                                return;
                        }
-#endif
-                       Builder.SetCustomAttribute (customBuilder);
+
+                       Builder.SetCustomAttribute ((ConstructorInfo) ctor.GetMetaInfo (), cdata);
                }
 
                public override void Emit (TypeContainer tc)
                {
                        base.Emit (tc);
 
-#if GMCS_SOURCE
                        if (has_extension_method)
-                               Builder.SetCustomAttribute (TypeManager.extension_attribute_attr);
-#endif
+                               PredefinedAttributes.Get.Extension.EmitAttribute (Builder);
 
-                       if (runtime_compatibility_attr_type != null) {
-                               // FIXME: Does this belong inside SRE.AssemblyBuilder instead?
-                               if (OptAttributes == null || !OptAttributes.Contains (runtime_compatibility_attr_type)) {
-                                       ConstructorInfo ci = TypeManager.GetPredefinedConstructor (
-                                               runtime_compatibility_attr_type, Location.Null, Type.EmptyTypes);
-                                       PropertyInfo [] pis = new PropertyInfo [1];
-                                       pis [0] = TypeManager.GetPredefinedProperty (runtime_compatibility_attr_type,
-                                               "WrapNonExceptionThrows", Location.Null, TypeManager.bool_type);
-                                       object [] pargs = new object [1];
-                                       pargs [0] = true;
-                                       Builder.SetCustomAttribute (new CustomAttributeBuilder (ci, new object [0], pis, pargs));
-                               }
+                       // FIXME: Does this belong inside SRE.AssemblyBuilder instead?
+                       PredefinedAttribute pa = PredefinedAttributes.Get.RuntimeCompatibility;
+                       if (pa.IsDefined && (OptAttributes == null || !OptAttributes.Contains (pa))) {
+                               var ci = TypeManager.GetPredefinedConstructor (pa.Type, Location.Null, TypeSpec.EmptyTypes);
+                               PropertyInfo [] pis = new PropertyInfo [1];
+                               pis [0] = TypeManager.GetPredefinedProperty (pa.Type,
+                                       "WrapNonExceptionThrows", Location.Null, TypeManager.bool_type).MetaInfo;
+                               object [] pargs = new object [1];
+                               pargs [0] = true;
+                               Builder.SetCustomAttribute (new CustomAttributeBuilder ((ConstructorInfo) ci.GetMetaInfo (), new object[0], pis, pargs));
                        }
 
                        if (declarative_security != null) {
@@ -1502,16 +1331,17 @@ namespace Mono.CSharp {
                                try {
                                        // Microsoft runtime hacking
                                        if (add_permission == null) {
-                                               Type assembly_builder = typeof (AssemblyBuilder).Assembly.GetType ("System.Reflection.Emit.AssemblyBuilderData");
+                                               var assembly_builder = typeof (AssemblyBuilder).Assembly.GetType ("System.Reflection.Emit.AssemblyBuilderData");
                                                add_permission = assembly_builder.GetMethod ("AddPermissionRequests", BindingFlags.Instance | BindingFlags.NonPublic);
 
                                                FieldInfo fi = typeof (AssemblyBuilder).GetField ("m_assemblyData", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.GetField);
                                                builder_instance = fi.GetValue (Builder);
                                        }
 
-                                       object[] args = new object [] { declarative_security [SecurityAction.RequestMinimum],
-                                                                                                 declarative_security [SecurityAction.RequestOptional],
-                                                                                                 declarative_security [SecurityAction.RequestRefuse] };
+                                       var args = new PermissionSet [3];
+                                       declarative_security.TryGetValue (SecurityAction.RequestMinimum, out args [0]);
+                                       declarative_security.TryGetValue (SecurityAction.RequestOptional, out args [1]);
+                                       declarative_security.TryGetValue (SecurityAction.RequestRefuse, out args [2]);
                                        add_permission.Invoke (builder_instance, args);
                                }
                                catch {
@@ -1550,117 +1380,4 @@ namespace Mono.CSharp {
                        }
                }               
        }
-
-       public class ModuleClass : CommonAssemblyModulClass {
-               // TODO: make it private and move all builder based methods here
-               public ModuleBuilder Builder;
-               bool m_module_is_unsafe;
-#if GMCS_SOURCE                
-               bool has_default_charset;
-#endif         
-
-               public CharSet DefaultCharSet = CharSet.Ansi;
-               public TypeAttributes DefaultCharSetType = TypeAttributes.AnsiClass;
-
-               static string[] attribute_targets = new string [] { "module" };
-
-               public ModuleClass (bool is_unsafe)
-               {
-                       m_module_is_unsafe = is_unsafe;
-               }
-
-               public override AttributeTargets AttributeTargets {
-                       get {
-                               return AttributeTargets.Module;
-                       }
-               }
-
-               public override bool IsClsComplianceRequired ()
-               {
-                       return CodeGen.Assembly.IsClsCompliant;
-               }
-
-               public override void Emit (TypeContainer tc) 
-               {
-                       base.Emit (tc);
-
-                       if (m_module_is_unsafe) {
-                               Type t = TypeManager.CoreLookupType ("System.Security", "UnverifiableCodeAttribute", Kind.Class, true);
-                               if (t != null) {
-                                       ConstructorInfo unverifiable_code_ctor = TypeManager.GetPredefinedConstructor (t, Location.Null, Type.EmptyTypes);
-                                       if (unverifiable_code_ctor != null)
-                                               Builder.SetCustomAttribute (new CustomAttributeBuilder (unverifiable_code_ctor, new object [0]));
-                               }
-                       }
-               }
-                
-               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder customBuilder)
-               {
-                       if (a.Type == TypeManager.cls_compliant_attribute_type) {
-                               if (CodeGen.Assembly.ClsCompliantAttribute == null) {
-                                       Report.Warning (3012, 1, a.Location, "You must specify the CLSCompliant attribute on the assembly, not the module, to enable CLS compliance checking");
-                               }
-                               else if (CodeGen.Assembly.IsClsCompliant != a.GetBoolean ()) {
-                                       Report.SymbolRelatedToPreviousError (CodeGen.Assembly.ClsCompliantAttribute.Location, CodeGen.Assembly.ClsCompliantAttribute.GetSignatureForError ());
-                                       Report.Warning (3017, 1, a.Location, "You cannot specify the CLSCompliant attribute on a module that differs from the CLSCompliant attribute on the assembly");
-                                       return;
-                               }
-                       }
-
-                       Builder.SetCustomAttribute (customBuilder);
-               }
-
-               public bool HasDefaultCharSet {
-                       get {
-#if GMCS_SOURCE                
-                               return has_default_charset;
-#else
-                               return false;
-#endif                                                         
-                       }
-               }
-
-               /// <summary>
-               /// It is called very early therefore can resolve only predefined attributes
-               /// </summary>
-               public void Resolve ()
-               {
-#if GMCS_SOURCE
-                       if (OptAttributes == null)
-                               return;
-
-                       if (!OptAttributes.CheckTargets())
-                               return;
-
-                       if (TypeManager.default_charset_type == null)
-                               return;
-
-                       Attribute a = ResolveAttribute (TypeManager.default_charset_type);
-                       if (a != null) {
-                               has_default_charset = true;
-                               DefaultCharSet = a.GetCharSetValue ();
-                               switch (DefaultCharSet) {
-                                       case CharSet.Ansi:
-                                       case CharSet.None:
-                                               break;
-                                       case CharSet.Auto:
-                                               DefaultCharSetType = TypeAttributes.AutoClass;
-                                               break;
-                                       case CharSet.Unicode:
-                                               DefaultCharSetType = TypeAttributes.UnicodeClass;
-                                               break;
-                                       default:
-                                               Report.Error (1724, a.Location, "Value specified for the argument to 'System.Runtime.InteropServices.DefaultCharSetAttribute' is not valid");
-                                               break;
-                               }
-                       }
-#endif
-               }
-
-               public override string[] ValidAttributeTargets {
-                       get {
-                               return attribute_targets;
-                       }
-               }
-       }
 }