Ooops.
[mono.git] / mcs / gmcs / codegen.cs
old mode 100755 (executable)
new mode 100644 (file)
index 3eff8d6..7f5d62e
@@ -4,14 +4,22 @@
 // Author:
 //   Miguel de Icaza (miguel@ximian.com)
 //
-// (C) 2001 Ximian, Inc.
+// (C) 2001, 2002, 2003 Ximian, Inc.
+// (C) 2004 Novell, Inc.
 //
-
+//#define PRODUCTION
 using System;
 using System.IO;
 using System.Collections;
+using System.Collections.Specialized;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Security.Cryptography;
+using System.Security.Permissions;
+
+using Mono.Security.Cryptography;
 
 namespace Mono.CSharp {
 
@@ -20,11 +28,17 @@ namespace Mono.CSharp {
        /// </summary>
        public class CodeGen {
                static AppDomain current_domain;
-               public static AssemblyBuilder AssemblyBuilder;
-               public static ModuleBuilder   ModuleBuilder;
-
                static public SymbolWriter SymbolWriter;
 
+               public static AssemblyClass Assembly;
+               public static ModuleClass Module;
+
+               static CodeGen ()
+               {
+                       Assembly = new AssemblyClass ();
+                       Module = new ModuleClass (RootContext.Unsafe);
+               }
+
                public static string Basename (string name)
                {
                        int pos = name.LastIndexOf ('/');
@@ -65,16 +79,16 @@ namespace Mono.CSharp {
                //
                // Initializes the symbol writer
                //
-               static void InitializeSymbolWriter ()
+               static void InitializeSymbolWriter (string filename)
                {
-                       SymbolWriter = SymbolWriter.GetSymbolWriter (ModuleBuilder);
+                       SymbolWriter = SymbolWriter.GetSymbolWriter (Module.Builder, filename);
 
                        //
                        // If we got an ISymbolWriter instance, initialize it.
                        //
                        if (SymbolWriter == null) {
                                Report.Warning (
-                                       -18, "Could not find the symbol writer assembly (Mono.CSharp.Debugger.dll). This is normally an installation problem. Please make sure to compile and install the mcs/class/Mono.CSharp.Debugger directory.");
+                                       -18, "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;
                        }
                }
@@ -84,15 +98,47 @@ namespace Mono.CSharp {
                //
                static public void Init (string name, string output, bool want_debugging_support)
                {
-                       AssemblyName an;
-
                        FileName = output;
-                       an = new AssemblyName ();
-                       an.Name = Path.GetFileNameWithoutExtension (name);
+                       AssemblyName an = Assembly.GetAssemblyName (name, output);
+
+                       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 TypeManager.GetAssemblies ()) {
+                                       AssemblyName ref_name = a.GetName ();
+                                       byte [] b = ref_name.GetPublicKeyToken ();
+                                       if (b == null || b.Length == 0) {
+                                               Report.Warning (1577, "Assembly generation failed " +
+                                                               "-- Referenced assembly '" +
+                                                               ref_name.Name +
+                                                               "' does not have a strong name.");
+                                               //Environment.Exit (1);
+                                       }
+                               }
+                       }
                        
                        current_domain = AppDomain.CurrentDomain;
-                       AssemblyBuilder = current_domain.DefineDynamicAssembly (
-                               an, AssemblyBuilderAccess.RunAndSave, Dirname (name));
+
+                       try {
+                               Assembly.Builder = current_domain.DefineDynamicAssembly (an,
+                                       AssemblyBuilderAccess.Save, Dirname (name));
+                       }
+                       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 `" +
+                                               RootContext.StrongNameKeyContainer + "'.");
+                                       Environment.Exit (1);
+                               }
+                               throw;
+                       }
+                       catch (CryptographicException) {
+                               if ((RootContext.StrongNameKeyContainer != null) || (RootContext.StrongNameKeyFile != null)) {
+                                       Report.Error (1548, "Could not use the specified key to strongname the assembly.");
+                                       Environment.Exit (1);
+                               }
+                               throw;
+                       }
 
                        //
                        // Pass a path-less name to DefineDynamicModule.  Wonder how
@@ -102,20 +148,33 @@ namespace Mono.CSharp {
                        // If the third argument is true, the ModuleBuilder will dynamically
                        // load the default symbol writer.
                        //
-                       ModuleBuilder = AssemblyBuilder.DefineDynamicModule (
-                               Basename (name), Basename (output), want_debugging_support);
+                       Module.Builder = Assembly.Builder.DefineDynamicModule (
+                               Basename (name), Basename (output), false);
 
                        if (want_debugging_support)
-                               InitializeSymbolWriter ();
+                               InitializeSymbolWriter (output);
                }
 
                static public void Save (string name)
                {
                        try {
-                               AssemblyBuilder.Save (Basename (name));
-                       } catch (System.IO.IOException io){
+                               Assembly.Builder.Save (Basename (name));
+                       }
+                       catch (COMException) {
+                               if ((RootContext.StrongNameKeyFile == null) || (!RootContext.StrongNameDelaySign))
+                                       throw;
+
+                               // FIXME: it seems Microsoft AssemblyBuilder doesn't like to delay sign assemblies 
+                               Report.Error (1548, "Couldn't delay-sign the assembly with the '" +
+                                       RootContext.StrongNameKeyFile +
+                                       "', Use MCS with the Mono runtime or CSC to compile this assembly.");
+                       }
+                       catch (System.IO.IOException io) {
                                Report.Error (16, "Could not write to file `"+name+"', cause: " + io.Message);
                        }
+
+                       if (SymbolWriter != null)
+                               SymbolWriter.WriteSymbolFile ();
                }
        }
 
@@ -126,7 +185,6 @@ namespace Mono.CSharp {
        // variable mapping.
        //
        public class VariableStorage {
-               ILGenerator ig;
                FieldBuilder fb;
                LocalBuilder local;
                
@@ -136,19 +194,18 @@ namespace Mono.CSharp {
                {
                        count++;
                        if (ec.InIterator)
-                               fb = IteratorHandler.Current.MapVariable ("s_", count.ToString (), t);
+                               fb = ec.CurrentIterator.MapVariable ("s_", count.ToString (), t);
                        else
                                local = ec.ig.DeclareLocal (t);
-                       ig = ec.ig;
                }
 
-               public void EmitThis ()
+               public void EmitThis (ILGenerator ig)
                {
                        if (fb != null)
                                ig.Emit (OpCodes.Ldarg_0);
                }
 
-               public void EmitStore ()
+               public void EmitStore (ILGenerator ig)
                {
                        if (fb == null)
                                ig.Emit (OpCodes.Stloc, local);
@@ -156,13 +213,48 @@ namespace Mono.CSharp {
                                ig.Emit (OpCodes.Stfld, fb);
                }
 
-               public void EmitLoad ()
+               public void EmitLoad (ILGenerator ig)
                {
                        if (fb == null)
                                ig.Emit (OpCodes.Ldloc, local);
                        else 
                                ig.Emit (OpCodes.Ldfld, fb);
                }
+
+               public void EmitLoadAddress (ILGenerator ig)
+               {
+                       if (fb == null)
+                               ig.Emit (OpCodes.Ldloca, local);
+                       else 
+                               ig.Emit (OpCodes.Ldflda, fb);
+               }
+               
+               public void EmitCall (ILGenerator ig, MethodInfo mi)
+               {
+                       // FIXME : we should handle a call like tostring
+                       // here, where boxing is needed. However, we will
+                       // never encounter that with the current usage.
+                       
+                       bool value_type_call;
+                       EmitThis (ig);
+                       if (fb == null) {
+                               value_type_call = local.LocalType.IsValueType;
+                               
+                               if (value_type_call)
+                                       ig.Emit (OpCodes.Ldloca, local);
+                               else
+                                       ig.Emit (OpCodes.Ldloc, local);
+                       } else {
+                               value_type_call = fb.FieldType.IsValueType;
+                               
+                               if (value_type_call)
+                                       ig.Emit (OpCodes.Ldflda, fb);
+                               else
+                                       ig.Emit (OpCodes.Ldfld, fb);
+                       }
+                       
+                       ig.Emit (value_type_call ? OpCodes.Call : OpCodes.Callvirt, mi);
+               }
        }
        
        /// <summary>
@@ -253,25 +345,12 @@ namespace Mono.CSharp {
                /// </summary>
                public bool HasReturnLabel;
 
-               /// <summary>
-               ///   Whether we are in a Finally block
-               /// </summary>
-               public bool InFinally;
-
-               /// <summary>
-               ///   Whether we are in a Try block
-               /// </summary>
-               public bool InTry;
-
                /// <summary>
                ///   Whether we are inside an iterator block.
                /// </summary>
                public bool InIterator;
 
-               /// <summary>
-               ///   Whether we need an explicit return statement at the end of the method.
-               /// </summary>
-               public bool NeedExplicitReturn;
+               public bool IsLastStatement;
                
                /// <summary>
                ///   Whether remapping of locals, parameters and fields is turned on.
@@ -279,11 +358,6 @@ namespace Mono.CSharp {
                /// </summary>
                public bool RemapToProxy;
 
-               /// <summary>
-               ///   Whether we are in a Catch block
-               /// </summary>
-               public bool InCatch;
-
                /// <summary>
                ///  Whether we are inside an unsafe block
                /// </summary>
@@ -297,7 +371,7 @@ namespace Mono.CSharp {
                /// <summary>
                ///  Whether we are inside an anonymous method.
                /// </summary>
-               public bool InAnonymousMethod;
+               public AnonymousMethod CurrentAnonymousMethod;
                
                /// <summary>
                ///   Location for this EmitContext
@@ -321,7 +395,36 @@ namespace Mono.CSharp {
                /// </summary>
                public bool InEnumContext;
 
-               protected Stack FlowStack;
+               /// <summary>
+               ///   Anonymous methods can capture local variables and fields,
+               ///   this object tracks it.  It is copied from the TopLevelBlock
+               ///   field.
+               /// </summary>
+               public CaptureContext capture_context;
+
+               /// <summary>
+               /// Trace when method is called and is obsolete then this member suppress message
+               /// when call is inside next [Obsolete] method or type.
+               /// </summary>
+               public bool TestObsoleteMethodUsage = true;
+
+               /// <summary>
+               ///    The current iterator
+               /// </summary>
+               public Iterator CurrentIterator;
+
+               /// <summary>
+               ///    Whether we are in the resolving stage or not
+               /// </summary>
+               enum Phase {
+                       Created,
+                       Resolving,
+                       Emitting
+               }
+               
+               Phase current_phase;
+               
+               FlowBranching current_flow_branching;
                
                public EmitContext (DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
                                    Type return_type, int code_flags, bool is_constructor)
@@ -332,6 +435,9 @@ namespace Mono.CSharp {
                        DeclSpace = ds;
                        CheckState = RootContext.Checked;
                        ConstantCheckState = true;
+
+                       if ((return_type is TypeBuilder) && return_type.IsGenericTypeDefinition)
+                               throw new Exception ("FUCK");
                        
                        IsStatic = (code_flags & Modifiers.STATIC) != 0;
                        InIterator = (code_flags & Modifiers.METHOD_YIELDS) != 0;
@@ -340,6 +446,7 @@ namespace Mono.CSharp {
                        IsConstructor = is_constructor;
                        CurrentBlock = null;
                        CurrentFile = 0;
+                       current_phase = Phase.Created;
                        
                        if (parent != null){
                                // Can only be null for the ResolveType contexts.
@@ -351,8 +458,6 @@ namespace Mono.CSharp {
                        }
                        loc = l;
 
-                       FlowStack = new Stack ();
-                       
                        if (ReturnType == TypeManager.void_type)
                                ReturnType = null;
                }
@@ -371,7 +476,13 @@ namespace Mono.CSharp {
 
                public FlowBranching CurrentBranching {
                        get {
-                               return (FlowBranching) FlowStack.Peek ();
+                               return current_flow_branching;
+                       }
+               }
+
+               public bool HaveCaptureInfo {
+                       get {
+                               return capture_context != null;
                        }
                }
 
@@ -381,11 +492,8 @@ namespace Mono.CSharp {
                // </summary>
                public FlowBranching StartFlowBranching (FlowBranching.BranchingType type, Location loc)
                {
-                       FlowBranching cfb = FlowBranching.CreateBranching (CurrentBranching, type, null, loc);
-
-                       FlowStack.Push (cfb);
-
-                       return cfb;
+                       current_flow_branching = FlowBranching.CreateBranching (CurrentBranching, type, null, loc);
+                       return current_flow_branching;
                }
 
                // <summary>
@@ -393,7 +501,6 @@ namespace Mono.CSharp {
                // </summary>
                public FlowBranching StartFlowBranching (Block block)
                {
-                       FlowBranching cfb;
                        FlowBranching.BranchingType type;
 
                        if (CurrentBranching.Type == FlowBranching.BranchingType.Switch)
@@ -401,22 +508,39 @@ namespace Mono.CSharp {
                        else
                                type = FlowBranching.BranchingType.Block;
 
-                       cfb = FlowBranching.CreateBranching (CurrentBranching, type, block, block.StartLocation);
+                       current_flow_branching = FlowBranching.CreateBranching (CurrentBranching, type, block, block.StartLocation);
+                       return current_flow_branching;
+               }
 
-                       FlowStack.Push (cfb);
+               public FlowBranchingException StartFlowBranching (ExceptionStatement stmt)
+               {
+                       FlowBranchingException branching = new FlowBranchingException (
+                               CurrentBranching, stmt);
+                       current_flow_branching = branching;
+                       return branching;
+               }
+
+               // <summary>
+               //   Ends a code branching.  Merges the state of locals and parameters
+               //   from all the children of the ending branching.
+               // </summary>
+               public FlowBranching.UsageVector DoEndFlowBranching ()
+               {
+                       FlowBranching old = current_flow_branching;
+                       current_flow_branching = current_flow_branching.Parent;
 
-                       return cfb;
+                       return current_flow_branching.MergeChild (old);
                }
 
                // <summary>
                //   Ends a code branching.  Merges the state of locals and parameters
                //   from all the children of the ending branching.
                // </summary>
-               public FlowBranching.FlowReturns EndFlowBranching ()
+               public FlowBranching.Reachability EndFlowBranching ()
                {
-                       FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+                       FlowBranching.UsageVector vector = DoEndFlowBranching ();
 
-                       return CurrentBranching.MergeChild (cfb);
+                       return vector.Reachability;
                }
 
                // <summary>
@@ -425,54 +549,158 @@ namespace Mono.CSharp {
                // </summary>
                public void KillFlowBranching ()
                {
-                       FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+                       current_flow_branching = current_flow_branching.Parent;
+               }
+
+               public void CaptureVariable (LocalInfo li)
+               {
+                       capture_context.AddLocal (CurrentAnonymousMethod, li);
+                       li.IsCaptured = true;
                }
 
-               public void EmitTopBlock (Block block, InternalParameters ip, Location loc)
+               public void CaptureParameter (string name, Type t, int idx)
                {
-                       bool has_ret = false;
+                       
+                       capture_context.AddParameter (this, CurrentAnonymousMethod, name, t, idx);
+               }
+               
+               //
+               // Use to register a field as captured
+               //
+               public void CaptureField (FieldExpr fe)
+               {
+                       capture_context.AddField (fe);
+               }
+
+               //
+               // Whether anonymous methods have captured variables
+               //
+               public bool HaveCapturedVariables ()
+               {
+                       if (capture_context != null)
+                               return capture_context.HaveCapturedVariables;
+                       return false;
+               }
+
+               //
+               // Whether anonymous methods have captured fields or this.
+               //
+               public bool HaveCapturedFields ()
+               {
+                       if (capture_context != null)
+                               return capture_context.HaveCapturedFields;
+                       return false;
+               }
+
+               //
+               // Emits the instance pointer for the host method
+               //
+               public void EmitMethodHostInstance (EmitContext target, AnonymousMethod am)
+               {
+                       if (capture_context != null)
+                               capture_context.EmitMethodHostInstance (target, am);
+                       else if (IsStatic)
+                               target.ig.Emit (OpCodes.Ldnull);
+                       else
+                               target.ig.Emit (OpCodes.Ldarg_0);
+               }
+
+               //
+               // Returns whether the `local' variable has been captured by an anonymous
+               // method
+               //
+               public bool IsCaptured (LocalInfo local)
+               {
+                       return capture_context.IsCaptured (local);
+               }
+
+               public bool IsParameterCaptured (string name)
+               {
+                       if (capture_context != null)
+                               return capture_context.IsParameterCaptured (name);
+                       return false;
+               }
+               
+               public void EmitMeta (ToplevelBlock b, InternalParameters ip)
+               {
+                       if (capture_context != null)
+                               capture_context.EmitHelperClasses (this);
+                       b.EmitMeta (this);
+
+                       if (HasReturnLabel)
+                               ReturnLabel = ig.DefineLabel ();
+               }
+
+               //
+               // 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).
+               //
+               public void EmitTopBlock (ToplevelBlock block, InternalParameters ip, Location loc)
+               {
+                       if (block == null)
+                               return;
+                       
+                       bool unreachable;
+                       
+                       if (ResolveTopBlock (null, block, ip, loc, out unreachable)){
+                               EmitMeta (block, ip);
+
+                               current_phase = Phase.Emitting;
+                               EmitResolvedTopBlock (block, unreachable);
+                       }
+               }
+
+               public bool ResolveTopBlock (EmitContext anonymous_method_host, ToplevelBlock block,
+                                            InternalParameters ip, Location loc, out bool unreachable)
+               {
+                       current_phase = Phase.Resolving;
+                       
+                       unreachable = false;
+
+                       capture_context = block.CaptureContext;
 
                        if (!Location.IsNull (loc))
                                CurrentFile = loc.File;
 
-                       if (block != null){
+#if PRODUCTION
                            try {
+#endif
                                int errors = Report.Errors;
 
-                               block.EmitMeta (this, ip);
+                               block.ResolveMeta (block, this, ip);
+
 
                                if (Report.Errors == errors){
                                        bool old_do_flow_analysis = DoFlowAnalysis;
                                        DoFlowAnalysis = true;
 
-                                       FlowBranching cfb = FlowBranching.CreateBranching (
+                                       if (anonymous_method_host != null)
+                                               current_flow_branching = FlowBranching.CreateBranching (
+                                               anonymous_method_host.CurrentBranching, FlowBranching.BranchingType.Block,
+                                               block, loc);
+                                       else 
+                                       current_flow_branching = FlowBranching.CreateBranching (
                                                null, FlowBranching.BranchingType.Block, block, loc);
-                                       FlowStack.Push (cfb);
 
                                        if (!block.Resolve (this)) {
-                                               FlowStack.Pop ();
+                                               current_flow_branching = null;
                                                DoFlowAnalysis = old_do_flow_analysis;
-                                               return;
+                                               return false;
                                        }
 
-                                       cfb = (FlowBranching) FlowStack.Pop ();
-                                       FlowBranching.FlowReturns returns = cfb.MergeTopBlock ();
+                                       FlowBranching.Reachability reachability = current_flow_branching.MergeTopBlock ();
+                                       current_flow_branching = null;
 
                                        DoFlowAnalysis = old_do_flow_analysis;
 
-                                       has_ret = block.Emit (this);
-
-                                       if ((returns == FlowBranching.FlowReturns.Always) ||
-                                           (returns == FlowBranching.FlowReturns.Exception) ||
-                                           (returns == FlowBranching.FlowReturns.Unreachable))
-                                               has_ret = true;
-
-                                       if (Report.Errors == errors){
-                                               if (RootContext.WarningLevel >= 3)
-                                                       block.UsageWarning ();
+                                       if (reachability.AlwaysReturns ||
+                                           reachability.AlwaysThrows ||
+                                           reachability.IsUnreachable)
+                                               unreachable = true;
                                        }
-                               }
-                           } catch {
+#if PRODUCTION
+                           } catch (Exception e) {
                                        Console.WriteLine ("Exception caught by the compiler while compiling:");
                                        Console.WriteLine ("   Block that caused the problem begin at: " + loc);
                                        
@@ -480,49 +708,67 @@ namespace Mono.CSharp {
                                                Console.WriteLine ("                     Block being compiled: [{0},{1}]",
                                                                   CurrentBlock.StartLocation, CurrentBlock.EndLocation);
                                        }
-                                       throw;
-                           }
+                                       Console.WriteLine (e.GetType ().FullName + ": " + e.Message);
+                               throw;
                        }
+#endif
 
-                       if (ReturnType != null && !has_ret){
-                               //
-                               // FIXME: we need full flow analysis to implement this
-                               // correctly and emit an error instead of a warning.
-                               //
-                               //
+                       if (ReturnType != null && !unreachable){
                                if (!InIterator){
+                                       if (CurrentAnonymousMethod != null){
+                                               Report.Error (1643, loc, "Not all code paths return a value in anonymous method of type `{0}'",
+                                                             CurrentAnonymousMethod.Type);
+                                       } else {
                                        Report.Error (161, loc, "Not all code paths return a value");
-                                       return;
+                                       }
+
+                                       return false;
                                }
                        }
+                       block.CompleteContexts ();
+
+                       return true;
+               }
+
+               public void EmitResolvedTopBlock (ToplevelBlock block, bool unreachable)
+               {
+                       if (block != null)
+                               block.Emit (this);
 
                        if (HasReturnLabel)
                                ig.MarkLabel (ReturnLabel);
+
                        if (return_value != null){
                                ig.Emit (OpCodes.Ldloc, return_value);
                                ig.Emit (OpCodes.Ret);
                        } else {
-                               if (!InTry){
-                                       if (InIterator)
-                                               has_ret = true;
-                                       
-                                       if (!has_ret || HasReturnLabel) {
-                                               ig.Emit (OpCodes.Ret);
-                                               NeedExplicitReturn = false;
-                                       }
-                               }
-
-                               // 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, emit an explicit ret here.
+                               //
+                               // 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.
+                               //
 
-                               if (NeedExplicitReturn) {
+                               if ((block != null) && block.IsDestructor) {
+                                       // Nothing to do; S.R.E automatically emits a leave.
+                               } else if (HasReturnLabel || (!unreachable && !InIterator)) {
                                        if (ReturnType != null)
                                                ig.Emit (OpCodes.Ldloc, TemporaryReturn ());
                                        ig.Emit (OpCodes.Ret);
                                }
                        }
+
+                       //
+                       // Close pending helper classes if we are the toplevel
+                       //
+                       if (capture_context != null && capture_context.ParentToplevel == null)
+                               capture_context.CloseHelperClasses ();
                }
 
                /// <summary>
@@ -537,7 +783,15 @@ namespace Mono.CSharp {
                        if (check_file && (CurrentFile != loc.File))
                                return;
 
-                       ig.MarkSequencePoint (null, loc.Row, 0, 0, 0);
+                       CodeGen.SymbolWriter.MarkSequencePoint (ig, loc.Row, 0);
+               }
+
+               public void DefineLocalVariable (string name, LocalBuilder builder)
+               {
+                       if (CodeGen.SymbolWriter == null)
+                               return;
+
+                       CodeGen.SymbolWriter.DefineLocalVariable (name, builder);
                }
 
                /// <summary>
@@ -605,22 +859,6 @@ namespace Mono.CSharp {
                /// </summary>
                public Label LoopBegin, LoopEnd;
 
-               /// <summary>
-               ///   Whether we are inside a loop and break/continue are possible.
-               /// </summary>
-               public bool  InLoop;
-
-               /// <summary>
-               ///   This is incremented each time we enter a try/catch block and
-               ///   decremented if we leave it.
-               /// </summary>
-               public int   TryCatchLevel;
-
-               /// <summary>
-               ///   The TryCatchLevel at the begin of the current loop.
-               /// </summary>
-               public int   LoopBeginTryCatchLevel;
-
                /// <summary>
                ///   Default target in a switch statement.   Only valid if
                ///   InSwitch is true
@@ -637,58 +875,65 @@ namespace Mono.CSharp {
                ///   return value from the function.  By default this is not
                ///   used.  This is only required when returns are found inside
                ///   Try or Catch statements.
+               ///
+               ///   This method is typically invoked from the Emit phase, so
+               ///   we allow the creation of a return label if it was not
+               ///   requested during the resolution phase.   Could be cleaned
+               ///   up, but it would replicate a lot of logic in the Emit phase
+               ///   of the code that uses it.
                /// </summary>
                public LocalBuilder TemporaryReturn ()
                {
                        if (return_value == null){
                                return_value = ig.DeclareLocal (ReturnType);
+                               if (!HasReturnLabel){
                                ReturnLabel = ig.DefineLabel ();
                                HasReturnLabel = true;
                        }
+                       }
 
                        return return_value;
                }
 
-               //
-               // Creates a field `name' with the type `t' on the proxy class
-               //
-               public FieldBuilder MapVariable (string name, Type t)
+               /// <summary>
+               ///   This method is used during the Resolution phase to flag the
+               ///   need to define the ReturnLabel
+               /// </summary>
+               public void NeedReturnLabel ()
                {
-                       if (InIterator){
-                               return IteratorHandler.Current.MapVariable ("v_", name, t);
+                       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 (!InIterator && !HasReturnLabel) 
+                               HasReturnLabel = true;
                        }
-
-                       throw new Exception ("MapVariable for an unknown state");
-               }
 
                //
-               // Invoke this routine to remap a VariableInfo into the
-               // proper MemberAccess expression
+               // Creates a field `name' with the type `t' on the proxy class
                //
-               public Expression RemapLocal (LocalInfo local_info)
+               public FieldBuilder MapVariable (string name, Type t)
                {
-                       FieldExpr fe = new FieldExpr (local_info.FieldBuilder, loc);
-                       fe.InstanceExpression = new ProxyInstance ();
-                       return fe.DoResolve (this);
-               }
+                       if (InIterator)
+                               return CurrentIterator.MapVariable ("v_", name, t);
 
-               public Expression RemapLocalLValue (LocalInfo local_info, Expression right_side)
-               {
-                       FieldExpr fe = new FieldExpr (local_info.FieldBuilder, loc);
-                       fe.InstanceExpression = new ProxyInstance ();
-                       return fe.DoResolveLValue (this, right_side);
+                       throw new Exception ("MapVariable for an unknown state");
                }
 
                public Expression RemapParameter (int idx)
                {
-                       FieldExpr fe = new FieldExprNoAddress (IteratorHandler.Current.parameter_fields [idx], loc);
+                       FieldExpr fe = new FieldExprNoAddress (CurrentIterator.parameter_fields [idx].FieldBuilder, loc);
                        fe.InstanceExpression = new ProxyInstance ();
                        return fe.DoResolve (this);
                }
 
                public Expression RemapParameterLValue (int idx, Expression right_side)
                {
-                       FieldExpr fe = new FieldExprNoAddress (IteratorHandler.Current.parameter_fields [idx], loc);
+                       FieldExpr fe = new FieldExprNoAddress (CurrentIterator.parameter_fields [idx].FieldBuilder, loc);
                        fe.InstanceExpression = new ProxyInstance ();
                        return fe.DoResolveLValue (this, right_side);
                }
@@ -700,13 +945,58 @@ namespace Mono.CSharp {
                public void EmitThis ()
                {
                        ig.Emit (OpCodes.Ldarg_0);
-
-                       if (!IsStatic){
-                               if (InIterator)
-                                       ig.Emit (OpCodes.Ldfld, IteratorHandler.Current.this_field);
+                       if (InIterator){
+                               if (!IsStatic){
+                               FieldBuilder this_field = CurrentIterator.this_field.FieldBuilder;
+                               if (TypeManager.IsValueType (this_field.FieldType))
+                                       ig.Emit (OpCodes.Ldflda, this_field);
                                else
-                                       throw new Exception ("EmitThis for an unknown state");
+                                       ig.Emit (OpCodes.Ldfld, this_field);
                        }
+                       } else if (capture_context != null && CurrentAnonymousMethod != null){
+                               ScopeInfo si = CurrentAnonymousMethod.Scope;
+                               while (si != null){
+                                       if (si.ParentLink != null)
+                                               ig.Emit (OpCodes.Ldfld, si.ParentLink);
+                                       if (si.THIS != null){
+                                               ig.Emit (OpCodes.Ldfld, si.THIS);
+                                               break;
+                                       }
+                                       si = si.ParentScope;
+                               }
+                       } 
+               }
+
+               //
+               // Emits the code necessary to load the instance required
+               // to access the captured LocalInfo
+               //
+               public void EmitCapturedVariableInstance (LocalInfo li)
+               {
+                       if (RemapToProxy){
+                               ig.Emit (OpCodes.Ldarg_0);
+                               return;
+                       }
+                       
+                       if (capture_context == null)
+                               throw new Exception ("Calling EmitCapturedContext when there is no capture_context");
+                       
+                       capture_context.EmitCapturedVariableInstance (this, li, CurrentAnonymousMethod);
+               }
+
+               public void EmitParameter (string name)
+               {
+                       capture_context.EmitParameter (this, name);
+               }
+
+               public void EmitAssignParameter (string name, Expression source, bool leave_copy, bool prepare_for_load)
+               {
+                       capture_context.EmitAssignParameter (this, name, source, leave_copy, prepare_for_load);
+               }
+
+               public void EmitAddressOfParameter (string name)
+               {
+                       capture_context.EmitAddressOfParameter (this, name);
                }
 
                public Expression GetThis (Location loc)
@@ -723,4 +1013,346 @@ namespace Mono.CSharp {
                        return my_this;
                }
        }
+
+
+       public abstract class CommonAssemblyModulClass: Attributable {
+               protected CommonAssemblyModulClass ():
+                       base (null)
+               {
+               }
+
+               public void AddAttributes (ArrayList attrs)
+               {
+                       if (OptAttributes == null) {
+                               OptAttributes = new Attributes (attrs);
+                               return;
+                       }
+                       OptAttributes.AddAttributes (attrs);
+               }
+
+               public virtual void Emit (TypeContainer tc) 
+               {
+                       if (OptAttributes == null)
+                               return;
+
+                       EmitContext ec = new EmitContext (tc, Mono.CSharp.Location.Null, null, null, 0, false);
+                       OptAttributes.Emit (ec, this);
+               }
+
+               protected Attribute GetClsCompliantAttribute ()
+               {
+                       if (OptAttributes == null)
+                               return null;
+
+                       // Ensure that we only have GlobalAttributes, since the Search below isn't safe with other types.
+                       if (!OptAttributes.CheckTargets (this))
+                               return null;
+
+                       EmitContext temp_ec = new EmitContext (RootContext.Tree.Types, Mono.CSharp.Location.Null, null, null, 0, false);
+                       Attribute a = OptAttributes.Search (TypeManager.cls_compliant_attribute_type, temp_ec);
+                       if (a != null) {
+                               a.Resolve (temp_ec);
+                       }
+                       return a;
+               }
+       }
+
+       public class AssemblyClass: CommonAssemblyModulClass {
+               // TODO: make it private and move all builder based methods here
+               public AssemblyBuilder Builder;
+                    
+               bool is_cls_compliant;
+               public Attribute ClsCompliantAttribute;
+
+               ListDictionary declarative_security;
+
+               static string[] attribute_targets = new string [] { "assembly" };
+
+               public AssemblyClass (): base ()
+               {
+                       is_cls_compliant = false;
+               }
+
+               public bool IsClsCompliant {
+                       get {
+                               return is_cls_compliant;
+                       }
+                       }
+
+               public override AttributeTargets AttributeTargets {
+                       get {
+                               return AttributeTargets.Assembly;
+                       }
+               }
+
+               public override bool IsClsCompliaceRequired(DeclSpace ds)
+               {
+                       return is_cls_compliant;
+               }
+
+               public void ResolveClsCompliance ()
+               {
+                       ClsCompliantAttribute = GetClsCompliantAttribute ();
+                       if (ClsCompliantAttribute == null)
+                               return;
+
+                       is_cls_compliant = ClsCompliantAttribute.GetClsCompliantAttributeValue (null);
+               }
+
+               // fix bug #56621
+               private void SetPublicKey (AssemblyName an, byte[] strongNameBlob) 
+               {
+                       try {
+                               // check for possible ECMA key
+                               if (strongNameBlob.Length == 16) {
+                                       // will be rejected if not "the" ECMA key
+                                       an.SetPublicKey (strongNameBlob);
+                               }
+                               else {
+                                       // take it, with or without, a private key
+                                       RSA rsa = CryptoConvert.FromCapiKeyBlob (strongNameBlob);
+                                       // and make sure we only feed the public part to Sys.Ref
+                                       byte[] publickey = CryptoConvert.ToCapiPublicKeyBlob (rsa);
+                                       
+                                       // AssemblyName.SetPublicKey requires an additional header
+                                       byte[] publicKeyHeader = new byte [12] { 0x00, 0x24, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x94, 0x00, 0x00, 0x00 };
+
+                                       byte[] encodedPublicKey = new byte [12 + publickey.Length];
+                                       Buffer.BlockCopy (publicKeyHeader, 0, encodedPublicKey, 0, 12);
+                                       Buffer.BlockCopy (publickey, 0, encodedPublicKey, 12, publickey.Length);
+                                       an.SetPublicKey (encodedPublicKey);
+                               }
+                       }
+                       catch (Exception) {
+                               Report.Error (1548, "Could not strongname the assembly. File `" +
+                                       RootContext.StrongNameKeyFile + "' incorrectly encoded.");
+                               Environment.Exit (1);
+                       }
+               }
+
+               // TODO: rewrite this code (to kill N bugs and make it faster) and use standard ApplyAttribute way.
+               public AssemblyName GetAssemblyName (string name, string output) 
+               {
+                       if (OptAttributes != null) {
+                               foreach (Attribute a in OptAttributes.Attrs) {
+                                      // cannot rely on any resolve-based members before you call Resolve
+                                      if (a.ExplicitTarget == null || a.ExplicitTarget != "assembly")
+                                              continue;
+
+                                       // TODO: This code is buggy: comparing Attribute name without resolving it is wrong.
+                                       //       However, this is invoked by CodeGen.Init, at which time none of the namespaces
+                                       //       are loaded yet.
+                                       switch (a.Name) {
+                                               case "AssemblyKeyFile":
+                                               case "AssemblyKeyFileAttribute":
+                                               case "System.Reflection.AssemblyKeyFileAttribute":
+                                                       if (RootContext.StrongNameKeyFile != null) {
+                                                               Report.SymbolRelatedToPreviousError (a.Location, a.Name);
+                                                               Report.Warning (1616, "Compiler option '{0}' overrides '{1}' given in source", "keyfile", "System.Reflection.AssemblyKeyFileAttribute");
+                                                       }
+                                                       else {
+                                                               string value = a.GetString ();
+                                                               if (value != String.Empty)
+                                                                       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, "keycontainer", "Compiler option '{0}' overrides '{1}' given in source", "System.Reflection.AssemblyKeyNameAttribute");
+                                                       }
+                                                       else {
+                                                               string value = a.GetString ();
+                                                               if (value != String.Empty)
+                                                                       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);
+
+                       // note: delay doesn't apply when using a key container
+                       if (RootContext.StrongNameKeyContainer != null) {
+                               an.KeyPair = new StrongNameKeyPair (RootContext.StrongNameKeyContainer);
+                               return an;
+                       }
+
+                       // strongname is optional
+                       if (RootContext.StrongNameKeyFile == null)
+                               return an;
+
+                       string AssemblyDir = Path.GetDirectoryName (output);
+
+                       // the StrongName key file may be relative to (a) the compiled
+                       // file or (b) to the output assembly. See bugzilla #55320
+                       // http://bugzilla.ximian.com/show_bug.cgi?id=55320
+
+                       // (a) relative to the compiled file
+                       string filename = Path.GetFullPath (RootContext.StrongNameKeyFile);
+                       bool exist = File.Exists (filename);
+                       if ((!exist) && (AssemblyDir != null) && (AssemblyDir != String.Empty)) {
+                               // (b) relative to the outputed assembly
+                               filename = Path.GetFullPath (Path.Combine (AssemblyDir, RootContext.StrongNameKeyFile));
+                               exist = File.Exists (filename);
+                       }
+
+                       if (exist) {
+                               using (FileStream fs = new FileStream (filename, FileMode.Open, FileAccess.Read)) {
+                                       byte[] snkeypair = new byte [fs.Length];
+                                       fs.Read (snkeypair, 0, snkeypair.Length);
+
+                                       if (RootContext.StrongNameDelaySign) {
+                                               // delayed signing - DO NOT include private key
+                                               SetPublicKey (an, snkeypair);
+                                       }
+                                       else {
+                                               // no delay so we make sure we have the private key
+                                               try {
+                                                       CryptoConvert.FromCapiPrivateKeyBlob (snkeypair);
+                                                       an.KeyPair = new StrongNameKeyPair (snkeypair);
+                                               }
+                                               catch (CryptographicException) {
+                                                       if (snkeypair.Length == 16) {
+                                                               // error # is different for ECMA key
+                                                               Report.Error (1606, "Could not strongname the assembly. " + 
+                                                                       "ECMA key can only be used to delay-sign assemblies");
+                                                       }
+                                                       else {
+                                                               Report.Error (1548, "Could not strongname the assembly. File `" +
+                                                                       RootContext.StrongNameKeyFile +
+                                                                       "' doesn't have a private key.");
+                                                       }
+                                                       Environment.Exit (1);
+                                               }
+                                       }
+                               }
+                       }
+                       else {
+                               Report.Error (1548, "Could not strongname the assembly. File `" +
+                                       RootContext.StrongNameKeyFile + "' not found.");
+                               Environment.Exit (1);
+                       }
+                       return an;
+               }
+
+               public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder customBuilder)
+               {
+                       if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (true)) {
+                               if (declarative_security == null)
+                                       declarative_security = new ListDictionary ();
+
+                               a.ExtractSecurityPermissionSet (declarative_security);
+                               return;
+                       }
+
+                       Builder.SetCustomAttribute (customBuilder);
+               }
+
+               public override void Emit (TypeContainer tc)
+               {
+                       base.Emit (tc);
+
+                       if (declarative_security != null) {
+
+                               MethodInfo add_permission = typeof (AssemblyBuilder).GetMethod ("AddPermissionRequests", BindingFlags.Instance | BindingFlags.NonPublic);
+                               object builder_instance = Builder;
+
+                               try {
+                                       // Microsoft runtime hacking
+                                       if (add_permission == null) {
+                                               Type 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] };
+                                       add_permission.Invoke (builder_instance, args);
+                               }
+                               catch {
+                                       Report.RuntimeMissingSupport (Location.Null, "assembly permission setting");
+                               }
+                       }
+               }
+
+               public override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
+       }
+
+       public class ModuleClass: CommonAssemblyModulClass {
+               // TODO: make it private and move all builder based methods here
+               public ModuleBuilder Builder;
+               bool m_module_is_unsafe;
+
+               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 IsClsCompliaceRequired(DeclSpace ds)
+               {
+                       return CodeGen.Assembly.IsClsCompliant;
+                       }
+
+               public override void Emit (TypeContainer tc) 
+               {
+                       base.Emit (tc);
+
+                       if (!m_module_is_unsafe)
+                               return;
+
+                       if (TypeManager.unverifiable_code_ctor == null) {
+                               Console.WriteLine ("Internal error ! Cannot set unverifiable code attribute.");
+                               return;
+                       }
+                               
+                       Builder.SetCustomAttribute (new CustomAttributeBuilder (TypeManager.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, 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.Name);
+                                       Report.Error (3017, 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 override string[] ValidAttributeTargets {
+                       get {
+                               return attribute_targets;
+                       }
+               }
+       }
 }