2006-12-30 Marek Safar <marek.safar@gmail.com>
[mono.git] / mcs / mcs / codegen.cs
index 372f29a87acf0095789a67775808786fd9182152..94d7a949eab33cf4889ac7e123de7a79bd7f07c4 100644 (file)
@@ -144,6 +144,12 @@ namespace Mono.CSharp {
                                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
                        // this copes with output in different directories then.
@@ -165,6 +171,9 @@ namespace Mono.CSharp {
                {
                        try {
                                Assembly.Builder.Save (Basename (name));
+
+                               if (SymbolWriter != null)
+                                       SymbolWriter.WriteSymbolFile ();
                        }
                        catch (COMException) {
                                if ((RootContext.StrongNameKeyFile == null) || (!RootContext.StrongNameDelaySign))
@@ -181,9 +190,6 @@ namespace Mono.CSharp {
                        catch (System.UnauthorizedAccessException ua) {
                                Report.Error (16, "Could not write to file `"+name+"', cause: " + ua.Message);
                        }
-
-                       if (SymbolWriter != null)
-                               SymbolWriter.WriteSymbolFile ();
                }
        }
 
@@ -193,6 +199,14 @@ namespace Mono.CSharp {
                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>
@@ -205,25 +219,50 @@ namespace Mono.CSharp {
                public DeclSpace TypeContainer;
                public ILGenerator   ig;
 
-               /// <summary>
-               ///   This variable 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>
-               
-               public bool CheckState;
-
-               /// <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>
-               public bool ConstantCheckState;
+               [Flags]
+               public enum Flags : byte {
+                       /// <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
+               }
+
+               Flags flags;
 
                /// <summary>
                ///   Whether we are emitting code inside a static or instance method
@@ -249,7 +288,7 @@ namespace Mono.CSharp {
                ///   The value that is allowed to be returned or NULL if there is no
                ///   return type.
                /// </summary>
-               public Type ReturnType;
+               public readonly Type ReturnType;
 
                /// <summary>
                ///   Points to the Type (extracted from the TypeContainer) that
@@ -262,16 +301,6 @@ namespace Mono.CSharp {
                /// </summary>
                public bool IsConstructor;
 
-               /// <summary>
-               ///   Whether we're control flow analysis enabled
-               /// </summary>
-               public bool DoFlowAnalysis;
-
-               /// <summary>
-               ///   Whether we're control flow analysis disabled on struct
-               /// </summary>
-               public bool OmitStructFlowAnalysis;
-
                /// <summary>
                ///   Keeps track of the Type to LocalBuilder temporary storage created
                ///   to store structures (used to compute the address of the structure
@@ -306,21 +335,11 @@ namespace Mono.CSharp {
 
                public bool IsLastStatement;
 
-               /// <summary>
-               ///  Whether we are inside an unsafe block
-               /// </summary>
-               public bool InUnsafe;
-
                /// <summary>
                ///  Whether we are in a `fixed' initialization
                /// </summary>
                public bool InFixedInitializer;
 
-               public bool InRefOutArgumentResolving;
-
-               public bool InCatch;
-               public bool InFinally;
-
                /// <summary>
                ///  Whether we are inside an anonymous method.
                /// </summary>
@@ -341,19 +360,14 @@ namespace Mono.CSharp {
                /// </summary>
                public bool InEnumContext;
 
-               /// <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;
-
                public readonly IResolveContext ResolveContext;
 
                /// <summary>
                ///    The current iterator
                /// </summary>
-               public Iterator CurrentIterator;
+               public Iterator CurrentIterator {
+                       get { return CurrentAnonymousMethod as Iterator; }
+               }
 
                /// <summary>
                ///    Whether we are in the resolving stage or not
@@ -363,7 +377,9 @@ namespace Mono.CSharp {
                        Resolving,
                        Emitting
                }
-               
+
+               bool isAnonymousMethodAllowed = true;
+
                Phase current_phase;
                FlowBranching current_flow_branching;
 
@@ -372,8 +388,8 @@ namespace Mono.CSharp {
 
                public override string ToString ()
                {
-                       return String.Format ("EmitContext ({0}:{1}:{2})", id,
-                                             CurrentIterator, capture_context, loc);
+                       return String.Format ("EmitContext ({0}:{1})", id,
+                                             CurrentAnonymousMethod, loc);
                }
                
                public EmitContext (IResolveContext rc, DeclSpace parent, DeclSpace ds, Location l, ILGenerator ig,
@@ -384,8 +400,14 @@ namespace Mono.CSharp {
 
                        TypeContainer = parent;
                        this.declSpace = ds;
-                       CheckState = RootContext.Checked;
-                       ConstantCheckState = true;
+                       if (RootContext.Checked)
+                               flags |= Flags.CheckState;
+                       flags |= Flags.ConstantCheckState;
+
+#if GMCS_SOURCE
+                       if ((return_type is TypeBuilder) && return_type.IsGenericTypeDefinition)
+                               throw new InternalErrorException ();
+#endif
 
                        IsStatic = (code_flags & Modifiers.STATIC) != 0;
                        MethodIsStatic = IsStatic;
@@ -395,11 +417,12 @@ namespace Mono.CSharp {
                        CurrentBlock = null;
                        CurrentFile = 0;
                        current_phase = Phase.Created;
-                       
+
                        if (parent != null){
                                // Can only be null for the ResolveType contexts.
                                ContainerType = parent.TypeBuilder;
-                               InUnsafe = rc.IsInUnsafeScope;
+                               if (rc.IsInUnsafeScope)
+                                       flags |= Flags.InUnsafe;
                        }
                        loc = l;
 
@@ -424,6 +447,71 @@ namespace Mono.CSharp {
                        set { declSpace = value; }
                }
 
+               public DeclSpace GenericDeclContainer {
+                       get { return DeclContainer; }
+               }
+
+               public bool CheckState {
+                       get { return (flags & Flags.CheckState) != 0; }
+               }
+
+               public bool ConstantCheckState {
+                       get { return (flags & Flags.ConstantCheckState) != 0; }
+               }
+
+               public bool InUnsafe {
+                       get { return (flags & Flags.InUnsafe) != 0; }
+               }
+
+               public bool InCatch {
+                       get { return (flags & Flags.InCatch) != 0; }
+               }
+
+               public bool InFinally {
+                       get { return (flags & Flags.InFinally) != 0; }
+               }
+
+               public bool DoFlowAnalysis {
+                       get { return (flags & Flags.DoFlowAnalysis) != 0; }
+               }
+
+               public bool OmitStructFlowAnalysis {
+                       get { return (flags & Flags.OmitStructFlowAnalysis) != 0; }
+               }
+
+               // 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
+               {
+                       EmitContext ec;
+                       Flags invmask, oldval;
+                       internal FlagsHandle (EmitContext ec, Flags mask, Flags val)
+                       {
+                               this.ec = ec;
+                               invmask = ~mask;
+                               oldval = ec.flags & mask;
+                               ec.flags = (ec.flags & invmask) | (val & mask);
+                       }
+                       public void Dispose ()
+                       {
+                               ec.flags = (ec.flags & invmask) | oldval;
+                       }
+               }
+
+               // Temporarily set all the given flags to the given value.  Should be used in an 'using' statement
+               public FlagsHandle With (Flags bits, bool enable)
+               {
+                       return new FlagsHandle (this, bits, enable ? bits : 0);
+               }
+
+               public FlagsHandle WithFlowAnalysis (bool do_flow_analysis, bool omit_struct_analysis)
+               {
+                       Flags newflags = 
+                               (do_flow_analysis ? Flags.DoFlowAnalysis : 0) |
+                               (omit_struct_analysis ? Flags.OmitStructFlowAnalysis : 0);
+                       return new FlagsHandle (this, Flags.DoFlowAnalysis | Flags.OmitStructFlowAnalysis, newflags);
+               }
+
                public bool IsInObsoleteScope {
                        get { return ResolveContext.IsInObsoleteScope; }
                }
@@ -432,21 +520,15 @@ namespace Mono.CSharp {
                        get { return InUnsafe || ResolveContext.IsInUnsafeScope; }
                }
 
+               public bool IsAnonymousMethodAllowed {
+                       get { return isAnonymousMethodAllowed; }
+                       set { isAnonymousMethodAllowed = value; }
+               }
 
                public FlowBranching CurrentBranching {
                        get { return current_flow_branching; }
                }
 
-               public bool HaveCaptureInfo {
-                       get { return capture_context != null; }
-               }
-
-               public void EmitScopeInitFromBlock (Block b)
-               {
-                       if (capture_context != null)
-                               capture_context.EmitScopeInitFromBlock (this, b);
-               }
-
                // <summary>
                //   Starts a new code branching.  This inherits the state of all local
                //   variables and parameters from the current branching.
@@ -470,7 +552,7 @@ namespace Mono.CSharp {
                        else
                                type = FlowBranching.BranchingType.Block;
 
-                       DoFlowAnalysis = true;
+                       flags |= Flags.DoFlowAnalysis;
 
                        current_flow_branching = FlowBranching.CreateBranching (
                                CurrentBranching, type, block, block.StartLocation);
@@ -479,8 +561,21 @@ namespace Mono.CSharp {
 
                public FlowBranchingException StartFlowBranching (ExceptionStatement stmt)
                {
-                       FlowBranchingException branching = new FlowBranchingException (
-                               CurrentBranching, stmt);
+                       FlowBranchingException branching = new FlowBranchingException (CurrentBranching, stmt);
+                       current_flow_branching = branching;
+                       return branching;
+               }
+
+               public FlowBranchingLabeled StartFlowBranching (LabeledStatement stmt)
+               {
+                       FlowBranchingLabeled branching = new FlowBranchingLabeled (CurrentBranching, stmt);
+                       current_flow_branching = branching;
+                       return branching;
+               }
+
+               public FlowBranchingToplevel StartFlowBranching (ToplevelBlock stmt)
+               {
+                       FlowBranchingToplevel branching = new FlowBranchingToplevel (CurrentBranching, stmt);
                        current_flow_branching = branching;
                        return branching;
                }
@@ -517,84 +612,17 @@ namespace Mono.CSharp {
                        current_flow_branching = current_flow_branching.Parent;
                }
 
-               public void CaptureVariable (LocalInfo li)
-               {
-                       capture_context.AddLocal (CurrentAnonymousMethod, li);
-                       li.IsCaptured = true;
-               }
-
-               public void CaptureParameter (string name, Type t, int idx)
-               {
-                       capture_context.AddParameter (this, CurrentAnonymousMethod, name, t, idx);
-               }
-
-               public void CaptureThis ()
-               {
-                       capture_context.CaptureThis (CurrentAnonymousMethod);
-               }
-               
-               
-               //
-               // Use to register a field as captured
-               //
-               public void CaptureField (FieldExpr fe)
-               {
-                       capture_context.AddField (this, CurrentAnonymousMethod, 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)
+               public bool MustCaptureVariable (LocalInfo local)
                {
-                       if (capture_context != null)
-                               return capture_context.IsParameterCaptured (name);
-                       return false;
+                       if (CurrentAnonymousMethod == null)
+                               return false;
+                       if (CurrentAnonymousMethod.IsIterator)
+                               return true;
+                       return local.Block.Toplevel != CurrentBlock.Toplevel;
                }
                
                public void EmitMeta (ToplevelBlock b)
                {
-                       if (capture_context != null)
-                               capture_context.EmitAnonymousHelperClasses (this);
                        b.EmitMeta (this);
 
                        if (HasReturnLabel)
@@ -633,8 +661,6 @@ namespace Mono.CSharp {
                        if (resolved)
                                return true;
 
-                       capture_context = block.CaptureContext;
-                       
                        if (!loc.IsNull)
                                CurrentFile = loc.File;
 
@@ -644,42 +670,40 @@ namespace Mono.CSharp {
                                if (!block.ResolveMeta (this, ip))
                                        return false;
 
-                               bool old_do_flow_analysis = DoFlowAnalysis;
-                               DoFlowAnalysis = true;
+                               if ((md != null) && (md.Iterator != null)) {
+                                       if (!md.Iterator.Resolve (this))
+                                               return false;
+                               }
 
-                               if (anonymous_method_host != null)
-                                       current_flow_branching = FlowBranching.CreateBranching (
-                                               anonymous_method_host.CurrentBranching,
-                                               FlowBranching.BranchingType.Block, block, loc);
-                               else 
-                                       current_flow_branching = block.TopLevelBranching;
+                               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;
 
-                               if (!block.Resolve (this)) {
+                                       current_flow_branching = top_level;
+                                       bool ok = block.Resolve (this);
                                        current_flow_branching = null;
-                                       DoFlowAnalysis = old_do_flow_analysis;
-                                       return false;
-                               }
-
-                               FlowBranching.Reachability reachability = current_flow_branching.MergeTopBlock ();
-                               current_flow_branching = null;
 
-                               DoFlowAnalysis = old_do_flow_analysis;
+                                       if (!ok)
+                                               return false;
 
-                               if (reachability.AlwaysReturns ||
-                                   reachability.AlwaysThrows ||
-                                   reachability.IsUnreachable)
-                                       unreachable = true;
+                                       FlowBranching.Reachability reachability = top_level.End ();
+                                       if (reachability.IsUnreachable)
+                                               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;
+                               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
 
@@ -689,12 +713,14 @@ namespace Mono.CSharp {
                                        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 ());
+                                                     CurrentAnonymousMethod.GetSignatureForError ());
                                        return false;
                                }
                        }
 
-                       block.CompleteContexts ();
+                       if (!block.CompleteContexts (this))
+                               return false;
+
                        resolved = true;
                        return true;
                }
@@ -703,10 +729,10 @@ namespace Mono.CSharp {
                {
                        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);
@@ -735,12 +761,6 @@ namespace Mono.CSharp {
                                        ig.Emit (OpCodes.Ret);
                                }
                        }
-
-                       //
-                       // Close pending helper classes if we are the toplevel
-                       //
-                       if (capture_context != null && capture_context.ParentToplevel == null)
-                               capture_context.CloseAnonymousHelperClasses ();
                }
 
                /// <summary>
@@ -788,58 +808,44 @@ namespace Mono.CSharp {
                /// </summary>
                public LocalBuilder GetTemporaryLocal (Type t)
                {
-                       LocalBuilder location = null;
-                       
-                       if (temporary_storage != null){
+                       if (temporary_storage != null) {
                                object o = temporary_storage [t];
-                               if (o != null){
-                                       if (o is ArrayList){
-                                               ArrayList al = (ArrayList) o;
-                                               
-                                               for (int i = 0; i < al.Count; i++){
-                                                       if (al [i] != null){
-                                                               location = (LocalBuilder) al [i];
-                                                               al [i] = null;
-                                                               break;
-                                                       }
-                                               }
-                                       } else
-                                               location = (LocalBuilder) o;
-                                       if (location != null)
-                                               return location;
+                               if (o != null) {
+                                       if (o is Stack) {
+                                               Stack s = (Stack) o;
+                                               o = s.Count == 0 ? null : s.Pop ();
+                                       } else {
+                                               temporary_storage.Remove (t);
+                                       }
                                }
+                               if (o != null)
+                                       return (LocalBuilder) o;
                        }
-                       
                        return ig.DeclareLocal (t);
                }
 
                public void FreeTemporaryLocal (LocalBuilder b, Type t)
                {
-                       if (temporary_storage == null){
+                       Stack s;
+
+                       if (temporary_storage == null) {
                                temporary_storage = new Hashtable ();
                                temporary_storage [t] = b;
                                return;
                        }
                        object o = temporary_storage [t];
-                       if (o == null){
+                       if (o == null) {
                                temporary_storage [t] = b;
                                return;
                        }
-                       if (o is ArrayList){
-                               ArrayList al = (ArrayList) o;
-                               for (int i = 0; i < al.Count; i++){
-                                       if (al [i] == null){
-                                               al [i] = b;
-                                               return;
-                                       }
-                               }
-                               al.Add (b);
-                               return;
+                       if (o is Stack) {
+                               s = (Stack) o;
+                       } else {
+                               s = new Stack ();
+                               s.Push (o);
+                               temporary_storage [t] = s;
                        }
-                       ArrayList replacement = new ArrayList ();
-                       replacement.Add (o);
-                       temporary_storage.Remove (t);
-                       temporary_storage [t] = replacement;
+                       s.Push (b);
                }
 
                /// <summary>
@@ -901,57 +907,7 @@ namespace Mono.CSharp {
                                HasReturnLabel = true;
                }
 
-               //
-               // Emits the proper object to address fields on a remapped
-               // variable/parameter to field in anonymous-method/iterator proxy classes.
-               //
-               public void EmitThis (bool need_address)
-               {
-                       ig.Emit (OpCodes.Ldarg_0);
-                       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){
-                                               if (need_address && TypeManager.IsValueType (si.THIS.FieldType))
-                                                       ig.Emit (OpCodes.Ldflda, si.THIS);
-                                               else
-                                                       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 (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, bool leave_copy, bool prepared, ref LocalTemporary temp)
-               {
-                       capture_context.EmitParameter (this, name, leave_copy, prepared, ref temp);
-               }
-
-               public void EmitAssignParameter (string name, Expression source, bool leave_copy, bool prepare_for_load, ref LocalTemporary  temp)
-               {
-                       capture_context.EmitAssignParameter (this, name, source, leave_copy, prepare_for_load, ref temp);
-               }
-
-               public void EmitAddressOfParameter (string name)
-               {
-                       capture_context.EmitAddressOfParameter (this, name);
-               }
-               
                public Expression GetThis (Location loc)
                {
                        This my_this;
@@ -977,11 +933,14 @@ namespace Mono.CSharp {
 
                public void AddAttributes (ArrayList attrs)
                {
-                       if (OptAttributes == null) {
-                               OptAttributes = new Attributes (attrs);
+                       foreach (Attribute a in attrs)
+                               a.AttachTo (this);
+
+                       if (attributes == null) {
+                               attributes = new Attributes (attrs);
                                return;
                        }
-                       OptAttributes.AddAttributes (attrs);
+                       attributes.AddAttributes (attrs);
                }
 
                public virtual void Emit (TypeContainer tc) 
@@ -991,16 +950,9 @@ namespace Mono.CSharp {
 
                        OptAttributes.Emit ();
                }
-                
+
                protected Attribute ResolveAttribute (Type a_type)
                {
-                       if (OptAttributes == null)
-                               return null;
-
-                       // Ensure that we only have GlobalAttributes, since the Search below isn't safe with other types.
-                       if (!OptAttributes.CheckTargets ())
-                               return null;
-
                        Attribute a = OptAttributes.Search (a_type);
                        if (a != null) {
                                a.Resolve ();
@@ -1009,29 +961,25 @@ namespace Mono.CSharp {
                }
 
                public override IResolveContext ResolveContext {
-                       get {
-                               return this;
-                       }
+                       get { return this; }
                }
 
                #region IResolveContext Members
 
                public DeclSpace DeclContainer {
-                       get {
-                               return RootContext.Tree.Types;
-                       }
+                       get { return RootContext.ToplevelTypes; }
+               }
+
+               public DeclSpace GenericDeclContainer {
+                       get { return DeclContainer; }
                }
 
                public bool IsInObsoleteScope {
-                       get {
-                               return false;
-                       }
+                       get { return false; }
                }
 
                public bool IsInUnsafeScope {
-                       get {
-                               return false;
-                       }
+                       get { return false; }
                }
 
                #endregion
@@ -1046,13 +994,20 @@ namespace Mono.CSharp {
                public Attribute ClsCompliantAttribute;
 
                ListDictionary declarative_security;
+#if GMCS_SOURCE
+               public AssemblyName Name;
+               MethodInfo add_type_forwarder;
+               ListDictionary emitted_forwarders;
+#endif
 
                // Module is here just because of error messages
                static string[] attribute_targets = new string [] { "assembly", "module" };
 
                public AssemblyClass (): base ()
                {
+#if GMCS_SOURCE
                        wrap_non_exception_throws = true;
+#endif
                }
 
                public bool IsClsCompliant {
@@ -1073,22 +1028,26 @@ namespace Mono.CSharp {
                        }
                }
 
-               public override bool IsClsComplianceRequired()
+               public override bool IsClsComplianceRequired ()
                {
                        return is_cls_compliant;
                }
 
                public void Resolve ()
                {
-                       if (OptAttributes != null)
-                               OptAttributes.AttachTo (this);
+                       if (OptAttributes == null)
+                               return;
+
+                       // Ensure that we only have GlobalAttributes, since the Search isn't safe with other types.
+                       if (!OptAttributes.CheckTargets())
+                               return;
 
                        ClsCompliantAttribute = ResolveAttribute (TypeManager.cls_compliant_attribute_type);
                        if (ClsCompliantAttribute != null) {
                                is_cls_compliant = ClsCompliantAttribute.GetClsCompliantAttributeValue ();
                        }
 
-#if NET_2_0
+#if GMCS_SOURCE
                        Attribute a = ResolveAttribute (TypeManager.runtime_compatibility_attr_type);
                        if (a != null) {
                                object val = a.GetPropertyValue ("WrapNonExceptionThrows");
@@ -1248,6 +1207,37 @@ namespace Mono.CSharp {
                        Report.Error (1548, "Error during assembly signing. " + text);
                }
 
+#if GMCS_SOURCE
+               bool CheckInternalsVisibleAttribute (Attribute a)
+               {
+                       string assembly_name = a.GetString ();
+                       if (assembly_name.Length == 0)
+                               return false;
+                               
+                       AssemblyName aname = null;
+                       try {
+                               aname = new AssemblyName (assembly_name);
+                       } catch (FileLoadException) {
+                       } catch (ArgumentException) {
+                       }
+                               
+                       // Bad assembly name format
+                       if (aname == null)
+                               Report.Warning (1700, 3, a.Location, "Assembly reference `" + assembly_name + "' is invalid and cannot be resolved");
+                       // Report error if we have defined Version or Culture
+                       else if (aname.Version != null || aname.CultureInfo != null)
+                               throw new Exception ("Friend assembly `" + a.GetString () + 
+                                               "' is invalid. InternalsVisibleTo cannot have version or culture specified.");
+                       else if (aname.GetPublicKey () == null && Name.GetPublicKey () != null) {
+                               Report.Error (1726, a.Location, "Friend assembly reference `" + aname.FullName + "' is invalid." +
+                                               " Strong named assemblies must specify a public key in their InternalsVisibleTo declarations");
+                               return false;
+                       }
+
+                       return true;
+               }
+#endif
+
                public override void ApplyAttributeBuilder (Attribute a, CustomAttributeBuilder customBuilder)
                {
                        if (a.Type.IsSubclassOf (TypeManager.security_attr_type) && a.CheckSecurityActionValidity (true)) {
@@ -1269,6 +1259,61 @@ namespace Mono.CSharp {
                                }
                        }
 
+#if GMCS_SOURCE
+                       if (a.Type == TypeManager.internals_visible_attr_type && !CheckInternalsVisibleAttribute (a))
+                               return;
+
+                       if (a.Type == TypeManager.type_forwarder_attr_type) {
+                               Type 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);
+                                       Report.Error(739, a.Location, "A duplicate type forward of type `{0}'",
+                                               TypeManager.CSharpName(t));
+                                       return;
+                               }
+
+                               emitted_forwarders.Add(t, a);
+
+                               if (TypeManager.LookupDeclSpace (t) != null) {
+                                       Report.SymbolRelatedToPreviousError (t);
+                                       Report.Error (729, a.Location, "Cannot forward type `{0}' because it is defined in this assembly",
+                                               TypeManager.CSharpName (t));
+                                       return;
+                               }
+
+                               if (t.IsNested) {
+                                       Report.Error (730, a.Location, "Cannot forward type `{0}' because it is a nested type",
+                                               TypeManager.CSharpName (t));
+                                       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);
+
+                                       if (add_type_forwarder == null) {
+                                               Report.RuntimeMissingSupport (a.Location, "TypeForwardedTo attribute");
+                                               return;
+                                       }
+                               }
+
+                               add_type_forwarder.Invoke (Builder, new object[] { t });
+                               return;
+                       }
+                       
+#endif
                        Builder.SetCustomAttribute (customBuilder);
                }
 
@@ -1276,6 +1321,20 @@ namespace Mono.CSharp {
                {
                        base.Emit (tc);
 
+#if GMCS_SOURCE
+                       // FIXME: Does this belong inside SRE.AssemblyBuilder instead?
+                       if (OptAttributes == null || !OptAttributes.Contains (TypeManager.runtime_compatibility_attr_type)) {
+                               ConstructorInfo ci = TypeManager.GetConstructor (
+                                       TypeManager.runtime_compatibility_attr_type, Type.EmptyTypes);
+                               PropertyInfo [] pis = new PropertyInfo [1];
+                               pis [0] = TypeManager.GetProperty (
+                                       TypeManager.runtime_compatibility_attr_type, "WrapNonExceptionThrows");
+                               object [] pargs = new object [1];
+                               pargs [0] = true;
+                               Builder.SetCustomAttribute (new CustomAttributeBuilder (ci, new object [0], pis, pargs));
+                       }
+#endif
+
                        if (declarative_security != null) {
 
                                MethodInfo add_permission = typeof (AssemblyBuilder).GetMethod ("AddPermissionRequests", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -1300,15 +1359,6 @@ namespace Mono.CSharp {
                                        Report.RuntimeMissingSupport (Location.Null, "assembly permission setting");
                                }
                        }
-
-#if NET_2_0
-                       if (!OptAttributes.Contains (TypeManager.runtime_compatibility_attr_type, null)) {
-                               ConstructorInfo ci = TypeManager.runtime_compatibility_attr_type.GetConstructor (Type.EmptyTypes);
-                               PropertyInfo pi = TypeManager.runtime_compatibility_attr_type.GetProperty ("WrapNonExceptionThrows");
-                               Builder.SetCustomAttribute (new CustomAttributeBuilder (ci, new object [0], 
-                                       new PropertyInfo [] { pi }, new object[] { true } ));
-                       }
-#endif
                }
 
                public override string[] ValidAttributeTargets {
@@ -1316,6 +1366,30 @@ namespace Mono.CSharp {
                                return attribute_targets;
                        }
                }
+
+               // Wrapper for AssemblyBuilder.AddModule
+               static MethodInfo adder_method;
+               static public MethodInfo AddModule_Method {
+                       get {
+                               if (adder_method == null)
+                                       adder_method = typeof (AssemblyBuilder).GetMethod ("AddModule", BindingFlags.Instance|BindingFlags.NonPublic);
+                               return adder_method;
+                       }
+               }
+               public Module AddModule (string module)
+               {
+                       MethodInfo m = AddModule_Method;
+                       if (m == null) {
+                               Report.RuntimeMissingSupport (Location.Null, "/addmodule");
+                               Environment.Exit (1);
+                       }
+
+                       try {
+                               return (Module) m.Invoke (Builder, new object [] { module });
+                       } catch (TargetInvocationException ex) {
+                               throw ex.InnerException;
+                       }
+               }               
        }
 
        public class ModuleClass : CommonAssemblyModulClass {
@@ -1339,16 +1413,13 @@ namespace Mono.CSharp {
                        }
                }
 
-               public override bool IsClsComplianceRequired()
+               public override bool IsClsComplianceRequired ()
                {
                        return CodeGen.Assembly.IsClsCompliant;
                }
 
                public override void Emit (TypeContainer tc) 
                {
-                       if (OptAttributes != null)
-                               OptAttributes.AttachTo (this);
-
                        base.Emit (tc);
 
                        if (!m_module_is_unsafe)
@@ -1381,9 +1452,15 @@ namespace Mono.CSharp {
                /// <summary>
                /// It is called very early therefore can resolve only predefined attributes
                /// </summary>
-               public void ResolveAttributes ()
+               public void Resolve ()
                {
-#if NET_2_0
+#if GMCS_SOURCE
+                       if (OptAttributes == null)
+                               return;
+
+                       if (!OptAttributes.CheckTargets())
+                               return;
+
                        Attribute a = ResolveAttribute (TypeManager.default_charset_type);
                        if (a != null) {
                                DefaultCharSet = a.GetCharSetValue ();