2007-06-20 Marek Safar <marek.safar@gmail.com>
[mono.git] / mcs / mcs / statement.cs
index 3264cf1d121f4a812ccf9327771cb09449565e08..207cf7bdc70a3094169c02bd3ad59728084d6a15 100644 (file)
@@ -99,9 +99,6 @@ namespace Mono.CSharp {
                public Statement Clone (CloneContext clonectx)
                {
                        Statement s = (Statement) this.MemberwiseClone ();
-                       if (s is Block)
-                               clonectx.AddBlockMap ((Block) this, (Block) s);
-                       
                        CloneTo (clonectx, s);
                        return s;
                }
@@ -325,7 +322,8 @@ namespace Mono.CSharp {
 
                        target.expr = expr.Clone (clonectx);
                        target.TrueStatement = TrueStatement.Clone (clonectx);
-                       target.FalseStatement = FalseStatement.Clone (clonectx);
+                       if (FalseStatement != null)
+                               target.FalseStatement = FalseStatement.Clone (clonectx);
                }
        }
 
@@ -916,7 +914,7 @@ namespace Mono.CSharp {
                        }
 
                        if (!ec.Switch.GotDefault){
-                               Report.Error (159, loc, "No such label `default:' within the scope of the goto statement");
+                               FlowBranchingBlock.Error_UnknownLabel (loc, "default");
                                return;
                        }
                        ec.ig.Emit (OpCodes.Br, ec.Switch.DefaultTarget);
@@ -975,7 +973,8 @@ namespace Mono.CSharp {
                        sl = (SwitchLabel) ec.Switch.Elements [val];
 
                        if (sl == null){
-                               Report.Error (159, loc, "No such label `case {0}:' within the scope of the goto statement", c.GetValue () == null ? "null" : val.ToString ());
+                               FlowBranchingBlock.Error_UnknownLabel (loc, "case " + 
+                                       (c.GetValue () == null ? "null" : val.ToString ()));
                                return false;
                        }
 
@@ -1136,10 +1135,15 @@ namespace Mono.CSharp {
                public abstract void EmitAddressOf (EmitContext ec);
        }
 
+       public interface IKnownVariable {
+               Block Block { get; }
+               Location Location { get; }
+       }
+
        //
        // The information about a user-perceived local variable
        //
-       public class LocalInfo {
+       public class LocalInfo : IKnownVariable {
                public Expression Type;
 
                public Type VariableType;
@@ -1239,7 +1243,7 @@ namespace Mono.CSharp {
                public bool Resolve (EmitContext ec)
                {
                        if (VariableType == null) {
-                               TypeExpr texpr = Type.ResolveAsTypeTerminal (ec, false);
+                               TypeExpr texpr = Type.ResolveAsContextualType (ec, false);
                                if (texpr == null)
                                        return false;
                                
@@ -1266,42 +1270,23 @@ namespace Mono.CSharp {
                }
 
                public bool IsCaptured {
-                       get {
-                               return (flags & Flags.Captured) != 0;
-                       }
-
-                       set {
-                               flags |= Flags.Captured;
-                       }
+                       get { return (flags & Flags.Captured) != 0; }
+                       set { flags |= Flags.Captured; }
                }
 
                public bool IsConstant {
-                       get {
-                               return (flags & Flags.IsConstant) != 0;
-                       }
-                       set {
-                               flags |= Flags.IsConstant;
-                       }
+                       get { return (flags & Flags.IsConstant) != 0; }
+                       set { flags |= Flags.IsConstant; }
                }
 
                public bool AddressTaken {
-                       get {
-                               return (flags & Flags.AddressTaken) != 0;
-                       }
-
-                       set {
-                               flags |= Flags.AddressTaken;
-                       }
+                       get { return (flags & Flags.AddressTaken) != 0; }
+                       set { flags |= Flags.AddressTaken; }
                }
 
                public bool CompilerGenerated {
-                       get {
-                               return (flags & Flags.CompilerGenerated) != 0;
-                       }
-
-                       set {
-                               flags |= Flags.CompilerGenerated;
-                       }
+                       get { return (flags & Flags.CompilerGenerated) != 0; }
+                       set { flags |= Flags.CompilerGenerated; }
                }
 
                public override string ToString ()
@@ -1311,18 +1296,12 @@ namespace Mono.CSharp {
                }
 
                public bool Used {
-                       get {
-                               return (flags & Flags.Used) != 0;
-                       }
-                       set {
-                               flags = value ? (flags | Flags.Used) : (unchecked (flags & ~Flags.Used));
-                       }
+                       get { return (flags & Flags.Used) != 0; }
+                       set { flags = value ? (flags | Flags.Used) : (unchecked (flags & ~Flags.Used)); }
                }
 
                public bool ReadOnly {
-                       get {
-                               return (flags & Flags.ReadOnly) != 0;
-                       }
+                       get { return (flags & Flags.ReadOnly) != 0; }
                }
 
                public void SetReadOnlyContext (ReadOnlyContext context)
@@ -1352,21 +1331,21 @@ namespace Mono.CSharp {
                // allocated in a pinned slot with DeclareLocal.
                //
                public bool Pinned {
-                       get {
-                               return (flags & Flags.Pinned) != 0;
-                       }
-                       set {
-                               flags = value ? (flags | Flags.Pinned) : (flags & ~Flags.Pinned);
-                       }
+                       get { return (flags & Flags.Pinned) != 0; }
+                       set { flags = value ? (flags | Flags.Pinned) : (flags & ~Flags.Pinned); }
                }
 
                public bool IsThis {
-                       get {
-                               return (flags & Flags.IsThis) != 0;
-                       }
-                       set {
-                               flags = value ? (flags | Flags.IsThis) : (flags & ~Flags.IsThis);
-                       }
+                       get { return (flags & Flags.IsThis) != 0; }
+                       set { flags = value ? (flags | Flags.IsThis) : (flags & ~Flags.IsThis); }
+               }
+
+               Block IKnownVariable.Block {
+                       get { return Block; }
+               }
+
+               Location IKnownVariable.Location {
+                       get { return Location; }
                }
 
                protected class LocalVariable : Variable
@@ -1439,28 +1418,22 @@ namespace Mono.CSharp {
                public readonly Location  StartLocation;
                public Location EndLocation = Location.Null;
 
-               public readonly ToplevelBlock Toplevel;
+               public ExplicitBlock Explicit;
+               public ToplevelBlock Toplevel;
 
                [Flags]
-               public enum Flags : ushort {
-                       Implicit  = 1,
-                       Unchecked = 2,
-                       BlockUsed = 4,
-                       VariablesInitialized = 8,
-                       HasRet = 16,
-                       IsDestructor = 32,
-                       IsToplevel = 64,
-                       Unsafe = 128,
-                       HasVarargs = 256, // Used in ToplevelBlock
-                       IsIterator = 512
-
+               public enum Flags : byte {
+                       Unchecked = 1,
+                       BlockUsed = 2,
+                       VariablesInitialized = 4,
+                       HasRet = 8,
+                       IsDestructor = 16,
+                       Unsafe = 32,
+                       HasVarargs = 64, // Used in ToplevelBlock
+                       IsIterator = 128
                }
                protected Flags flags;
 
-               public bool Implicit {
-                       get { return (flags & Flags.Implicit) != 0; }
-               }
-
                public bool Unchecked {
                        get { return (flags & Flags.Unchecked) != 0; }
                        set { flags |= Flags.Unchecked; }
@@ -1475,6 +1448,7 @@ namespace Mono.CSharp {
                // The statements in this block
                //
                protected ArrayList statements;
+               protected int current_statement;
                int num_statements;
 
                //
@@ -1532,8 +1506,13 @@ namespace Mono.CSharp {
 
                public Block (Block parent, Flags flags, Location start, Location end)
                {
-                       if (parent != null)
+                       if (parent != null) {
                                parent.AddChild (this);
+
+                               // the appropriate constructors will fixup these fields
+                               Toplevel = parent.Toplevel;
+                               Explicit = parent.Explicit;
+                       }
                        
                        this.Parent = parent;
                        this.flags = flags;
@@ -1542,23 +1521,12 @@ namespace Mono.CSharp {
                        this.loc = start;
                        this_id = id++;
                        statements = new ArrayList ();
-
-                       if ((flags & Flags.IsToplevel) != 0)
-                               Toplevel = (ToplevelBlock) this;
-                       else
-                               Toplevel = parent.Toplevel;
-
-                       if (parent != null && Implicit) {
-                               if (parent.known_variables == null)
-                                       parent.known_variables = new Hashtable ();
-                               // share with parent
-                               known_variables = parent.known_variables;
-                       }
                }
 
                public Block CreateSwitchBlock (Location start)
                {
-                       Block new_block = new Block (this, start, start);
+                       // FIXME: should this be implicit?
+                       Block new_block = new ExplicitBlock (this, start, start);
                        new_block.switch_block = this;
                        return new_block;
                }
@@ -1591,7 +1559,7 @@ namespace Mono.CSharp {
                protected static void Error_158 (string name, Location loc)
                {
                        Report.Error (158, loc, "The label `{0}' shadows another label " +
-                                     "by the same name in a contained scope.", name);
+                                     "by the same name in a contained scope", name);
                }
 
                /// <summary>
@@ -1612,13 +1580,14 @@ namespace Mono.CSharp {
 
                        Block cur = this;
                        while (cur != null) {
-                               if (cur.DoLookupLabel (name) != null) {
-                                       Report.Error (140, target.loc,
-                                                     "The label `{0}' is a duplicate", name);
+                               LabeledStatement s = cur.DoLookupLabel (name);
+                               if (s != null) {
+                                       Report.SymbolRelatedToPreviousError (s.loc, s.Name);
+                                       Report.Error (140, target.loc, "The label `{0}' is a duplicate", name);
                                        return false;
                                }
 
-                               if (!Implicit)
+                               if (this == Explicit)
                                        break;
 
                                cur = cur.Parent;
@@ -1636,6 +1605,7 @@ namespace Mono.CSharp {
                                                if (s == null)
                                                        continue;
 
+                                               Report.SymbolRelatedToPreviousError (s.loc, s.Name);
                                                Error_158 (name, target.loc);
                                                return false;
                                        }
@@ -1663,7 +1633,7 @@ namespace Mono.CSharp {
                                return null;
 
                        foreach (Block child in children) {
-                               if (!child.Implicit)
+                               if (Explicit != child.Explicit)
                                        continue;
 
                                s = child.LookupLabel (name);
@@ -1686,59 +1656,22 @@ namespace Mono.CSharp {
                        return null;
                }
 
-               Hashtable known_variables;
-
-               // <summary>
-               //   Marks a variable with name @name as being used in this or a child block.
-               //   If a variable name has been used in a child block, it's illegal to
-               //   declare a variable with the same name in the current block.
-               // </summary>
-               void AddKnownVariable (string name, LocalInfo info)
-               {
-                       if (known_variables == null)
-                               known_variables = new Hashtable ();
-
-                       known_variables [name] = info;
-               }
-
-               LocalInfo GetKnownVariableInfo (string name, bool recurse)
-               {
-                       if (known_variables != null) {
-                               LocalInfo vi = (LocalInfo) known_variables [name];
-                               if (vi != null)
-                                       return vi;
-                       }
-
-                       if (!recurse || (children == null))
-                               return null;
-
-                       foreach (Block block in children) {
-                               LocalInfo vi = block.GetKnownVariableInfo (name, true);
-                               if (vi != null)
-                                       return vi;
-                       }
-
-                       return null;
-               }
-
                public bool CheckInvariantMeaningInBlock (string name, Expression e, Location loc)
                {
                        Block b = this;
-                       LocalInfo kvi = b.GetKnownVariableInfo (name, true);
+                       IKnownVariable kvi = b.Explicit.GetKnownVariable (name);
                        while (kvi == null) {
-                               while (b.Implicit)
-                                       b = b.Parent;
-                               b = b.Parent;
+                               b = b.Explicit.Parent;
                                if (b == null)
                                        return true;
-                               kvi = b.GetKnownVariableInfo (name, false);
+                               kvi = b.Explicit.GetKnownVariable (name);
                        }
 
                        if (kvi.Block == b)
                                return true;
 
                        // Is kvi.Block nested inside 'b'
-                       if (b.known_variables != kvi.Block.known_variables) {
+                       if (b.Explicit != kvi.Block.Explicit) {
                                //
                                // If a variable by the same name it defined in a nested block of this
                                // block, we violate the invariant meaning in a block.
@@ -1765,7 +1698,7 @@ namespace Mono.CSharp {
                        // an indirect check that depends on AddVariable doing its
                        // part in maintaining the invariant-meaning-in-block property.
                        //
-                       if (e is LocalVariableReference || (e is Constant && b.GetLocalInfo (name) != null))
+                       if (e is VariableReference || (e is Constant && b.GetLocalInfo (name) != null))
                                return true;
 
                        //
@@ -1777,109 +1710,12 @@ namespace Mono.CSharp {
                        return false;
                }
 
-               public bool CheckError136_InParents (string name, Location loc)
-               {
-                       for (Block b = Parent; b != null; b = b.Parent) {
-                               if (!b.DoCheckError136 (name, "parent or current", loc))
-                                       return false;
-                       }
-
-                       for (Block b = Toplevel.ContainerBlock; b != null; b = b.Toplevel.ContainerBlock) {
-                               if (!b.CheckError136_InParents (name, loc))
-                                       return false;
-                       }
-
-                       return true;
-               }
-
-               public bool CheckError136_InChildren (string name, Location loc)
-               {
-                       if (!DoCheckError136_InChildren (name, loc))
-                               return false;
-
-                       Block b = this;
-                       while (b.Implicit) {
-                               if (!b.Parent.DoCheckError136_InChildren (name, loc))
-                                       return false;
-                               b = b.Parent;
-                       }
-
-                       return true;
-               }
-
-               protected bool DoCheckError136_InChildren (string name, Location loc)
-               {
-                       if (!DoCheckError136 (name, "child", loc))
-                               return false;
-
-                       if (AnonymousChildren != null) {
-                               foreach (ToplevelBlock child in AnonymousChildren) {
-                                       if (!child.DoCheckError136_InChildren (name, loc))
-                                               return false;
-                               }
-                       }
-
-                       if (children != null) {
-                               foreach (Block child in children) {
-                                       if (!child.DoCheckError136_InChildren (name, loc))
-                                               return false;
-                               }
-                       }
-
-                       return true;
-               }
-
-               public bool CheckError136 (string name, string scope, bool check_parents,
-                                          bool check_children, Location loc)
-               {
-                       if (!DoCheckError136 (name, scope, loc))
-                               return false;
-
-                       if (check_parents) {
-                               if (!CheckError136_InParents (name, loc))
-                                       return false;
-                       }
-
-                       if (check_children) {
-                               if (!CheckError136_InChildren (name, loc))
-                                       return false;
-                       }
-
-                       for (Block c = Toplevel.ContainerBlock; c != null; c = c.Toplevel.ContainerBlock) {
-                               if (!c.DoCheckError136 (name, "parent or current", loc))
-                                       return false;
-                       }
-
-                       return true;
-               }
-
-               protected bool DoCheckError136 (string name, string scope, Location loc)
-               {
-                       LocalInfo vi = GetKnownVariableInfo (name, false);
-                       if (vi != null) {
-                               Report.SymbolRelatedToPreviousError (vi.Location, name);
-                               Error_AlreadyDeclared (loc, name, scope != null ? scope : "child");
-                               return false;
-                       }
-
-                       int idx;
-                       Parameter p = Toplevel.Parameters.GetParameterByName (name, out idx);
-                       if (p != null) {
-                               Report.SymbolRelatedToPreviousError (p.Location, name);
-                               Error_AlreadyDeclared (
-                                       loc, name, scope != null ? scope : "method argument");
-                               return false;
-                       }
-
-                       return true;
-               }
-
                public LocalInfo AddVariable (Expression type, string name, Location l)
                {
                        LocalInfo vi = GetLocalInfo (name);
                        if (vi != null) {
                                Report.SymbolRelatedToPreviousError (vi.Location, name);
-                               if (known_variables == vi.Block.known_variables)
+                               if (Explicit == vi.Block.Explicit)
                                        Report.Error (128, l,
                                                "A local variable named `{0}' is already defined in this scope", name);
                                else
@@ -1887,20 +1723,31 @@ namespace Mono.CSharp {
                                return null;
                        }
 
-                       if (!CheckError136 (name, null, true, true, l))
+                       ToplevelParameterInfo pi = Toplevel.GetParameterInfo (name);
+                       if (pi != null) {
+                               Report.SymbolRelatedToPreviousError (pi.Location, name);
+                               Error_AlreadyDeclared (loc, name,
+                                       pi.Block == Toplevel ? "method argument" : "parent or current");
+                       }
+
+                       IKnownVariable kvi = Explicit.GetKnownVariable (name);
+                       if (kvi != null) {
+                               Report.SymbolRelatedToPreviousError (kvi.Location, name);
+                               Error_AlreadyDeclared (l, name, "child");
                                return null;
+                       }
 
                        vi = new LocalInfo (type, name, this, l);
                        Variables.Add (name, vi);
-                       AddKnownVariable (name, vi);
+                       Explicit.AddKnownVariable (name, vi);
 
                        if ((flags & Flags.VariablesInitialized) != 0)
-                               throw new Exception ();
+                               throw new InternalErrorException ("block has already been resolved");
 
                        return vi;
                }
 
-               void Error_AlreadyDeclared (Location loc, string var, string reason)
+               protected static void Error_AlreadyDeclared (Location loc, string var, string reason)
                {
                        Report.Error (136, loc, "A local variable named `{0}' cannot be declared " +
                                      "in this scope because it would give a different meaning " +
@@ -1976,6 +1823,12 @@ namespace Mono.CSharp {
                        statements.Add (s);
                        flags |= Flags.BlockUsed;
                }
+               
+               public void InsertStatementAfterCurrent (Statement statement)
+               {
+                       statements.Insert (current_statement + 1, statement);
+                       flags |= Flags.BlockUsed;
+               }
 
                public bool Used {
                        get { return (flags & Flags.BlockUsed) != 0; }
@@ -1999,24 +1852,12 @@ namespace Mono.CSharp {
                        flags |= Flags.IsDestructor;
                }
 
-               VariableMap param_map, local_map;
-
-               public VariableMap ParameterMap {
-                       get {
-                               if ((flags & Flags.VariablesInitialized) == 0){
-                                       throw new Exception ("Variables have not been initialized yet");
-                               }
-
-                               return param_map;
-                       }
-               }
-
-               public VariableMap LocalMap {
+               int assignable_slots;
+               public int AssignableSlots {
                        get {
                                if ((flags & Flags.VariablesInitialized) == 0)
                                        throw new Exception ("Variables have not been initialized yet");
-
-                               return local_map;
+                               return assignable_slots;
                        }
                }
 
@@ -2046,119 +1887,89 @@ namespace Mono.CSharp {
                        anonymous_children.Add (b);
                }
 
-               /// <summary>
-               ///   Emits the variable declarations and labels.
-               /// </summary>
-               /// <remarks>
-               ///   tc: is our typecontainer (to resolve type references)
-               ///   ig: is the code generator:
-               /// </remarks>
-               public void ResolveMeta (ToplevelBlock toplevel, EmitContext ec, Parameters ip)
+               void DoResolveConstants (EmitContext ec)
                {
-                       Report.Debug (64, "BLOCK RESOLVE META", this, Parent, toplevel);
-
-                       // If some parent block was unsafe, we remain unsafe even if this block
-                       // isn't explicitly marked as such.
-                       using (ec.With (EmitContext.Flags.InUnsafe, ec.InUnsafe | Unsafe)) {
-                               //
-                               // Compute the VariableMap's.
-                               //
-                               // Unfortunately, we don't know the type when adding variables with
-                               // AddVariable(), so we need to compute this info here.
-                               //
-
-                               LocalInfo[] locals;
-                               if (variables != null) {
-                                       foreach (LocalInfo li in variables.Values)
-                                               li.Resolve (ec);
-
-                                       locals = new LocalInfo [variables.Count];
-                                       variables.Values.CopyTo (locals, 0);
-                               } else
-                                       locals = new LocalInfo [0];
+                       if (constants == null)
+                               return;
 
-                               if (Parent != null)
-                                       local_map = new VariableMap (Parent.LocalMap, locals);
-                               else
-                                       local_map = new VariableMap (locals);
+                       if (variables == null)
+                               throw new InternalErrorException ("cannot happen");
 
-                               param_map = new VariableMap (ip);
-                               flags |= Flags.VariablesInitialized;
+                       foreach (DictionaryEntry de in variables) {
+                               string name = (string) de.Key;
+                               LocalInfo vi = (LocalInfo) de.Value;
+                               Type variable_type = vi.VariableType;
 
-                               //
-                               // Process this block variables
-                               //
-                               if (variables != null) {
-                                       foreach (DictionaryEntry de in variables) {
-                                               string name = (string) de.Key;
-                                               LocalInfo vi = (LocalInfo) de.Value;
-                                               Type variable_type = vi.VariableType;
+                               if (variable_type == null)
+                                       continue;
 
-                                               if (variable_type == null)
-                                                       continue;
+                               Expression cv = (Expression) constants [name];
+                               if (cv == null)
+                                       continue;
 
-                                               if (variable_type.IsPointer) {
-                                                       //
-                                                       // Am not really convinced that this test is required (Microsoft does it)
-                                                       // but the fact is that you would not be able to use the pointer variable
-                                                       // *anyways*
-                                                       //
-                                                       if (!TypeManager.VerifyUnManaged (TypeManager.GetElementType (variable_type),
-                                                                                         vi.Location))
-                                                               continue;
-                                               }
+                               // Don't let 'const int Foo = Foo;' succeed.
+                               // Removing the name from 'constants' ensures that we get a LocalVariableReference below,
+                               // which in turn causes the 'must be constant' error to be triggered.
+                               constants.Remove (name);
 
-                                               if (constants == null)
-                                                       continue;
+                               if (!Const.IsConstantTypeValid (variable_type)) {
+                                       Const.Error_InvalidConstantType (variable_type, loc);
+                                       continue;
+                               }
 
-                                               Expression cv = (Expression) constants [name];
-                                               if (cv == null)
-                                                       continue;
+                               ec.CurrentBlock = this;
+                               Expression e;
+                               using (ec.With (EmitContext.Flags.ConstantCheckState, (flags & Flags.Unchecked) == 0)) {
+                                       e = cv.Resolve (ec);
+                               }
+                               if (e == null)
+                                       continue;
 
-                                               // Don't let 'const int Foo = Foo;' succeed.
-                                               // Removing the name from 'constants' ensures that we get a LocalVariableReference below,
-                                               // which in turn causes the 'must be constant' error to be triggered.
-                                               constants.Remove (name);
+                               Constant ce = e as Constant;
+                               if (ce == null) {
+                                       Const.Error_ExpressionMustBeConstant (vi.Location, name);
+                                       continue;
+                               }
 
-                                               if (!Const.IsConstantTypeValid (variable_type)) {
-                                                       Const.Error_InvalidConstantType (variable_type, loc);
-                                                       continue;
-                                               }
+                               e = ce.ConvertImplicitly (variable_type);
+                               if (e == null) {
+                                       if (!variable_type.IsValueType && variable_type != TypeManager.string_type && !ce.IsDefaultValue)
+                                               Const.Error_ConstantCanBeInitializedWithNullOnly (vi.Location, vi.Name);
+                                       else
+                                               ce.Error_ValueCannotBeConverted (null, vi.Location, variable_type, false);
+                                       continue;
+                               }
 
-                                               using (ec.With (EmitContext.Flags.ConstantCheckState, (flags & Flags.Unchecked) == 0)) {
-                                                       ec.CurrentBlock = this;
-                                                       Expression e = cv.Resolve (ec);
-                                                       if (e == null)
-                                                               continue;
+                               constants.Add (name, e);
+                               vi.IsConstant = true;
+                       }
+               }
 
-                                                       Constant ce = e as Constant;
-                                                       if (ce == null) {
-                                                               Const.Error_ExpressionMustBeConstant (vi.Location, name);
-                                                               continue;
-                                                       }
+               protected void ResolveMeta (EmitContext ec, int offset)
+               {
+                       Report.Debug (64, "BLOCK RESOLVE META", this, Parent);
 
-                                                       e = ce.ConvertImplicitly (variable_type);
-                                                       if (e == null) {
-                                                               if (!variable_type.IsValueType && variable_type != TypeManager.string_type && !ce.IsDefaultValue)
-                                                                       Const.Error_ConstantCanBeInitializedWithNullOnly (vi.Location, vi.Name);
-                                                               else
-                                                                       ce.Error_ValueCannotBeConverted (null, vi.Location, variable_type, false);
-                                                               continue;
-                                                       }
+                       // If some parent block was unsafe, we remain unsafe even if this block
+                       // isn't explicitly marked as such.
+                       using (ec.With (EmitContext.Flags.InUnsafe, ec.InUnsafe | Unsafe)) {
+                               flags |= Flags.VariablesInitialized;
 
-                                                       constants.Add (name, e);
-                                                       vi.IsConstant = true;
-                                               }
+                               if (variables != null) {
+                                       foreach (LocalInfo li in variables.Values) {
+                                               if (!li.Resolve (ec))
+                                                       continue;
+                                               li.VariableInfo = new VariableInfo (li, offset);
+                                               offset += li.VariableInfo.Length;
                                        }
                                }
+                               assignable_slots = offset;
 
-                               //
-                               // Now, handle the children
-                               //
-                               if (children != null) {
-                                       foreach (Block b in children)
-                                               b.ResolveMeta (toplevel, ec, ip);
-                               }
+                               DoResolveConstants (ec);
+
+                               if (children == null)
+                                       return;
+                               foreach (Block b in children)
+                                       b.ResolveMeta (ec, offset);
                        }
                }
 
@@ -2264,13 +2075,12 @@ namespace Mono.CSharp {
                        // from the beginning of the function.  The outer Resolve() that detected the unreachability is
                        // responsible for handling the situation.
                        //
-                       int statement_count = statements.Count;
-                       for (int ix = 0; ix < statement_count; ix++){
-                               Statement s = (Statement) statements [ix];
+                       for (current_statement = 0; current_statement < statements.Count; current_statement++) {
+                               Statement s = (Statement) statements [current_statement];
                                // Check possible empty statement (CS0642)
                                if (RootContext.WarningLevel >= 3 &&
-                                       ix + 1 < statement_count &&
-                                               statements [ix + 1] is Block)
+                                       current_statement + 1 < statements.Count &&
+                                               statements [current_statement + 1] is Block)
                                        CheckPossibleMistakenEmptyStatement (s);
 
                                //
@@ -2299,14 +2109,14 @@ namespace Mono.CSharp {
 
                                if (!s.Resolve (ec)) {
                                        ok = false;
-                                       statements [ix] = EmptyStatement.Value;
+                                       statements [current_statement] = EmptyStatement.Value;
                                        continue;
                                }
 
                                if (unreachable && !(s is LabeledStatement) && !(s is Block))
-                                       statements [ix] = EmptyStatement.Value;
+                                       statements [current_statement] = EmptyStatement.Value;
 
-                               num_statements = ix + 1;
+                               num_statements = current_statement + 1;
 
                                unreachable = ec.CurrentBranching.CurrentUsageVector.IsUnreachable;
                                if (unreachable && s is LabeledStatement)
@@ -2314,7 +2124,7 @@ namespace Mono.CSharp {
                        }
 
                        Report.Debug (4, "RESOLVE BLOCK DONE", StartLocation,
-                                     ec.CurrentBranching, statement_count, num_statements);
+                                     ec.CurrentBranching, statements.Count, num_statements);
 
                        if (!ok)
                                return false;
@@ -2328,9 +2138,7 @@ namespace Mono.CSharp {
 
                        // If we're a non-static `struct' constructor which doesn't have an
                        // initializer, then we must initialize all of the struct's fields.
-                       if ((flags & Flags.IsToplevel) != 0 && 
-                           !Toplevel.IsThisAssigned (ec) &&
-                           !vector.IsUnreachable)
+                       if (this == Toplevel && !Toplevel.IsThisAssigned (ec) && !vector.IsUnreachable)
                                ok = false;
 
                        if ((labels != null) && (RootContext.WarningLevel >= 2)) {
@@ -2372,15 +2180,6 @@ namespace Mono.CSharp {
                {
                        for (int ix = 0; ix < num_statements; ix++){
                                Statement s = (Statement) statements [ix];
-
-                               // Check whether we are the last statement in a
-                               // top-level block.
-
-                               if (((Parent == null) || Implicit) && (ix+1 == num_statements) && !(s is Block))
-                                       ec.IsLastStatement = true;
-                               else
-                                       ec.IsLastStatement = false;
-
                                s.Emit (ec);
                        }
                }
@@ -2392,7 +2191,7 @@ namespace Mono.CSharp {
                        ec.CurrentBlock = this;
 
                        bool emit_debug_info = (CodeGen.SymbolWriter != null);
-                       bool is_lexical_block = !Implicit && (Parent != null);
+                       bool is_lexical_block = this == Explicit && Parent != null;
 
                        if (emit_debug_info) {
                                if (is_lexical_block)
@@ -2421,21 +2220,6 @@ namespace Mono.CSharp {
                        ec.CurrentBlock = prev_block;
                }
 
-               //
-               // Returns true if we ar ea child of `b'.
-               //
-               public bool IsChildOf (Block b)
-               {
-                       Block current = this;
-                       
-                       do {
-                               if (current.Parent == b)
-                                       return true;
-                               current = current.Parent;
-                       } while (current != null);
-                       return false;
-               }
-
                public override string ToString ()
                {
                        return String.Format ("{0} ({1}:{2})", GetType (),ID, StartLocation);
@@ -2445,6 +2229,10 @@ namespace Mono.CSharp {
                {
                        Block target = (Block) t;
 
+                       clonectx.AddBlockMap (this, target);
+
+                       target.Toplevel = (ToplevelBlock) clonectx.LookupBlock (Toplevel);
+                       target.Explicit = (ExplicitBlock) clonectx.LookupBlock (Explicit);
                        if (Parent != null)
                                target.Parent = clonectx.LookupBlock (Parent);
                        
@@ -2478,6 +2266,71 @@ namespace Mono.CSharp {
                }
        }
 
+       public class ExplicitBlock : Block {
+               public ExplicitBlock (Block parent, Location start, Location end)
+                       : this (parent, (Flags) 0, start, end)
+               {
+               }
+
+               public ExplicitBlock (Block parent, Flags flags, Location start, Location end)
+                       : base (parent, flags, start, end)
+               {
+                       this.Explicit = this;
+               }
+
+               Hashtable known_variables;
+
+               // <summary>
+               //   Marks a variable with name @name as being used in this or a child block.
+               //   If a variable name has been used in a child block, it's illegal to
+               //   declare a variable with the same name in the current block.
+               // </summary>
+               internal void AddKnownVariable (string name, IKnownVariable info)
+               {
+                       if (known_variables == null)
+                               known_variables = new Hashtable ();
+
+                       known_variables [name] = info;
+
+                       if (Parent != null)
+                               Parent.Explicit.AddKnownVariable (name, info);
+               }
+
+               internal IKnownVariable GetKnownVariable (string name)
+               {
+                       return known_variables == null ? null : (IKnownVariable) known_variables [name];
+               }
+
+               protected override void CloneTo (CloneContext clonectx, Statement t)
+               {
+                       ExplicitBlock target = (ExplicitBlock) t;
+                       target.known_variables = null;
+                       base.CloneTo (clonectx, t);
+               }
+       }
+
+       public class ToplevelParameterInfo : IKnownVariable {
+               public readonly ToplevelBlock Block;
+               public readonly int Index;
+               public VariableInfo VariableInfo;
+
+               Block IKnownVariable.Block {
+                       get { return Block; }
+               }
+               public Parameter Parameter {
+                       get { return Block.Parameters [Index]; }
+               }
+               public Location Location {
+                       get { return Parameter.Location; }
+               }
+
+               public ToplevelParameterInfo (ToplevelBlock block, int idx)
+               {
+                       this.Block = block;
+                       this.Index = idx;
+               }
+       }
+
        //
        // A toplevel block contains extra information, the split is done
        // only to separate information that would otherwise bloat the more
@@ -2486,13 +2339,7 @@ namespace Mono.CSharp {
        // In particular, this was introduced when the support for Anonymous
        // Methods was implemented. 
        // 
-       public class ToplevelBlock : Block {
-               //
-               // Pointer to the host of this anonymous method, or null
-               // if we are the topmost block
-               //
-               Block container;
-               ToplevelBlock child;    
+       public class ToplevelBlock : ExplicitBlock {
                GenericMethod generic;
                FlowBranchingToplevel top_level_branching;
                AnonymousContainer anonymous_container;
@@ -2517,15 +2364,13 @@ namespace Mono.CSharp {
 
                public bool CompleteContexts (EmitContext ec)
                {
-                       Report.Debug (64, "TOPLEVEL COMPLETE CONTEXTS", this,
-                                     container, root_scope);
+                       Report.Debug (64, "TOPLEVEL COMPLETE CONTEXTS", this, Parent, root_scope);
 
                        if (root_scope != null)
                                root_scope.LinkScopes ();
 
-                       if ((container == null) && (root_scope != null)) {
-                               Report.Debug (64, "TOPLEVEL COMPLETE CONTEXTS #1", this,
-                                             root_scope);
+                       if (Parent == null && root_scope != null) {
+                               Report.Debug (64, "TOPLEVEL COMPLETE CONTEXTS #1", this, root_scope);
 
                                if (root_scope.DefineType () == null)
                                        return false;
@@ -2545,11 +2390,7 @@ namespace Mono.CSharp {
                }
 
                public ToplevelBlock Container {
-                       get { return container != null ? container.Toplevel : null; }
-               }
-
-               public Block ContainerBlock {
-                       get { return container; }
+                       get { return Parent == null ? null : Parent.Toplevel; }
                }
 
                public AnonymousContainer AnonymousContainer {
@@ -2557,18 +2398,13 @@ namespace Mono.CSharp {
                        set { anonymous_container = value; }
                }
 
-               //
-               // Parent is only used by anonymous blocks to link back to their
-               // parents
-               //
-               public ToplevelBlock (Block container, Parameters parameters, Location start) :
-                       this (container, (Flags) 0, parameters, start)
+               public ToplevelBlock (Block parent, Parameters parameters, Location start) :
+                       this (parent, (Flags) 0, parameters, start)
                {
                }
 
-               public ToplevelBlock (Block container, Parameters parameters, GenericMethod generic,
-                                     Location start) :
-                       this (container, parameters, start)
+               public ToplevelBlock (Block parent, Parameters parameters, GenericMethod generic, Location start) :
+                       this (parent, parameters, start)
                {
                        this.generic = generic;
                }
@@ -2583,17 +2419,37 @@ namespace Mono.CSharp {
                {
                }
 
-               public ToplevelBlock (Block container, Flags flags, Parameters parameters, Location start) :
-                       base (null, flags | Flags.IsToplevel, start, Location.Null)
+               // We use 'Parent' to hook up to the containing block, but don't want to register the current block as a child.
+               // So, we use a two-stage setup -- first pass a null parent to the base constructor, and then override 'Parent'.
+               public ToplevelBlock (Block parent, Flags flags, Parameters parameters, Location start) :
+                       base (null, flags, start, Location.Null)
                {
+                       this.Toplevel = this;
+
                        this.parameters = parameters == null ? Parameters.EmptyReadOnlyParameters : parameters;
-                       this.container = container;
+                       this.Parent = parent;
+                       if (parent != null)
+                               parent.AddAnonymousChild (this);
+
+                       if (this.parameters.Count != 0)
+                               ProcessParameters ();
                }
 
                public ToplevelBlock (Location loc) : this (null, (Flags) 0, null, loc)
                {
                }
 
+               protected override void CloneTo (CloneContext clonectx, Statement t)
+               {
+                       ToplevelBlock target = (ToplevelBlock) t;
+                       base.CloneTo (clonectx, t);
+
+                       if (parameters.Count != 0)
+                               target.parameter_info = new ToplevelParameterInfo [parameters.Count];
+                       for (int i = 0; i < parameters.Count; ++i)
+                               target.parameter_info [i] = new ToplevelParameterInfo (target, i);
+               }
+
                public bool CheckError158 (string name, Location loc)
                {
                        if (AnonymousChildren != null) {
@@ -2611,10 +2467,43 @@ namespace Mono.CSharp {
                        return true;
                }
 
+               ToplevelParameterInfo [] parameter_info;
+               void ProcessParameters ()
+               {
+                       int n = parameters.Count;
+                       parameter_info = new ToplevelParameterInfo [n];
+                       for (int i = 0; i < n; ++i) {
+                               parameter_info [i] = new ToplevelParameterInfo (this, i);
+
+                               string name = parameters [i].Name;
+
+                               LocalInfo vi = GetLocalInfo (name);
+                               if (vi != null) {
+                                       Report.SymbolRelatedToPreviousError (vi.Location, name);
+                                       Error_AlreadyDeclared (loc, name, "parent or current");
+                                       continue;
+                               }
+
+                               ToplevelParameterInfo pi = Parent == null ? null : Parent.Toplevel.GetParameterInfo (name);
+                               if (pi != null) {
+                                       Report.SymbolRelatedToPreviousError (pi.Location, name);
+                                       Error_AlreadyDeclared (loc, name, "parent or current");
+                                       continue;
+                               }
+
+                               AddKnownVariable (name, parameter_info [i]);
+                       }
+
+                       // mark this block as "used" so that we create local declarations in a sub-block
+                       // FIXME: This appears to uncover a lot of bugs
+                       //this.Use ();
+               }
+
                bool DoCheckError158 (string name, Location loc)
                {
                        LabeledStatement s = LookupLabel (name);
                        if (s != null) {
+                               Report.SymbolRelatedToPreviousError (s.loc, s.Name);
                                Error_158 (name, loc);
                                return false;
                        }
@@ -2640,10 +2529,9 @@ namespace Mono.CSharp {
 
                public void CreateIteratorHost (RootScopeInfo root)
                {
-                       Report.Debug (64, "CREATE ITERATOR HOST", this, root,
-                                     container, root_scope);
+                       Report.Debug (64, "CREATE ITERATOR HOST", this, root, Parent, root_scope);
 
-                       if ((container != null) || (root_scope != null))
+                       if (Parent != null || root_scope != null)
                                throw new InternalErrorException ();
 
                        scope_info = root_scope = root;
@@ -2675,9 +2563,10 @@ namespace Mono.CSharp {
                //
                public void ReParent (ToplevelBlock new_parent)
                {
-                       container = new_parent;
+                       if ((flags & Flags.VariablesInitialized) != 0)
+                               throw new InternalErrorException ("block has already been resolved");
+
                        Parent = new_parent;
-                       new_parent.child = this;
                }
 
                //
@@ -2686,14 +2575,17 @@ namespace Mono.CSharp {
                //
                public ParameterReference GetParameterReference (string name, Location loc)
                {
-                       Parameter par;
-                       int idx;
+                       ToplevelParameterInfo p = GetParameterInfo (name);
+                       return p == null ? null : new ParameterReference (this, p, loc);
+               }
 
+               public ToplevelParameterInfo GetParameterInfo (string name)
+               {
+                       int idx;
                        for (ToplevelBlock t = this; t != null; t = t.Container) {
-                               Parameters pars = t.Parameters;
-                               par = pars.GetParameterByName (name, out idx);
+                               Parameter par = t.Parameters.GetParameterByName (name, out idx);
                                if (par != null)
-                                       return new ParameterReference (par, this, idx, loc);
+                                       return t.parameter_info [idx];
                        }
                        return null;
                }
@@ -2758,6 +2650,7 @@ namespace Mono.CSharp {
                public bool ResolveMeta (EmitContext ec, Parameters ip)
                {
                        int errors = Report.Errors;
+                       int orig_count = parameters.Count;
 
                        if (top_level_branching != null)
                                return true;
@@ -2765,23 +2658,54 @@ namespace Mono.CSharp {
                        if (ip != null)
                                parameters = ip;
 
-                       if (!IsIterator && (container != null) && (parameters != null)) {
-                               foreach (Parameter p in parameters.FixedParameters) {
-                                       if (!CheckError136_InParents (p.Name, loc))
-                                               return false;
-                               }
-                       }
+                       // Assert: orig_count != parameter.Count => orig_count == 0
+                       if (orig_count != 0 && orig_count != parameters.Count)
+                               throw new InternalErrorException ("parameter information mismatch");
 
-                       ResolveMeta (this, ec, ip);
+                       int offset = Parent == null ? 0 : Parent.AssignableSlots;
 
-                       if (child != null)
-                               child.ResolveMeta (this, ec, ip);
+                       for (int i = 0; i < orig_count; ++i) {
+                               Parameter.Modifier mod = parameters.ParameterModifier (i);
+
+                               if ((mod & Parameter.Modifier.OUT) != Parameter.Modifier.OUT)
+                                       continue;
+
+                               VariableInfo vi = new VariableInfo (ip, i, offset);
+                               parameter_info [i].VariableInfo = vi;
+                               offset += vi.Length;
+                       }
+
+                       ResolveMeta (ec, offset);
 
                        top_level_branching = ec.StartFlowBranching (this);
 
                        return Report.Errors == errors;
                }
 
+               // <summary>
+               //   Check whether all `out' parameters have been assigned.
+               // </summary>
+               public void CheckOutParameters (FlowBranching.UsageVector vector, Location loc)
+               {
+                       if (vector.IsUnreachable)
+                               return;
+
+                       int n = parameter_info == null ? 0 : parameter_info.Length;
+
+                       for (int i = 0; i < n; i++) {
+                               VariableInfo var = parameter_info [i].VariableInfo;
+
+                               if (var == null)
+                                       continue;
+
+                               if (vector.IsAssigned (var, false))
+                                       continue;
+
+                               Report.Error (177, loc, "The out parameter `{0}' must be assigned to before control leaves the current method",
+                                       var.Name);
+                       }
+               }
+
                public override void EmitMeta (EmitContext ec)
                {
                        base.EmitMeta (ec);
@@ -2792,7 +2716,7 @@ namespace Mono.CSharp {
                {
                        flags |= Flags.IsIterator;
 
-                       Block block = new Block (this);
+                       Block block = new ExplicitBlock (this, StartLocation, EndLocation);
                        foreach (Statement stmt in statements)
                                block.AddStatement (stmt);
                        statements = new ArrayList ();
@@ -3425,7 +3349,11 @@ namespace Mono.CSharp {
                        
                        if (!fFoundDefault) {
                                ig.MarkLabel (lblDefault);
+                               if (HaveUnwrap && !fFoundNull) {
+                                       ig.MarkLabel (null_target);
+                               }
                        }
+                       
                        ig.MarkLabel (lblEnd);
                }
                //
@@ -3743,10 +3671,6 @@ namespace Mono.CSharp {
 
                        FlowBranchingException branching = ec.StartFlowBranching (this);
                        bool ok = Statement.Resolve (ec);
-                       if (!ok) {
-                               ec.KillFlowBranching ();
-                               return false;
-                       }
 
                        ResolveFinally (branching);
 
@@ -3765,7 +3689,7 @@ namespace Mono.CSharp {
                        temp = new TemporaryVariable (t, loc);
                        temp.Resolve (ec);
                        
-                       return true;
+                       return ok;
                }
                
                protected override void DoEmit (EmitContext ec)
@@ -4008,7 +3932,7 @@ namespace Mono.CSharp {
                        foreach (Pair p in declarators){
                                LocalInfo vi = (LocalInfo) p.First;
                                Expression e = (Expression) p.Second;
-
+                               
                                vi.VariableInfo.SetAssigned (ec);
                                vi.SetReadOnlyContext (LocalInfo.ReadOnlyContext.Fixed);
 
@@ -4143,16 +4067,11 @@ namespace Mono.CSharp {
                        }
 
                        ec.StartFlowBranching (FlowBranching.BranchingType.Conditional, loc);
-
-                       if (!statement.Resolve (ec)) {
-                               ec.KillFlowBranching ();
-                               return false;
-                       }
-
+                       bool ok = statement.Resolve (ec);
                        bool flow_unreachable = ec.EndFlowBranching ();
                        has_ret = flow_unreachable;
 
-                       return true;
+                       return ok;
                }
                
                protected override void DoEmit (EmitContext ec)
@@ -4469,7 +4388,7 @@ namespace Mono.CSharp {
                Type expr_type;
                Expression [] resolved_vars;
                Expression [] converted_vars;
-               ExpressionStatement [] assign;
+               Expression [] assign;
                TemporaryVariable local_copy;
                
                public Using (object expression_or_block, Statement stmt, Location l)
@@ -4484,81 +4403,52 @@ namespace Mono.CSharp {
                //
                bool ResolveLocalVariableDecls (EmitContext ec)
                {
-                       int i = 0;
-
-                       TypeExpr texpr = expr.ResolveAsTypeTerminal (ec, false);
-                       if (texpr == null)
-                               return false;
+                       resolved_vars = new Expression[var_list.Count];
+                       assign = new Expression [var_list.Count];
+                       converted_vars = new Expression[var_list.Count];
 
-                       expr_type = texpr.Type;
-
-                       //
-                       // The type must be an IDisposable or an implicit conversion
-                       // must exist.
-                       //
-                       converted_vars = new Expression [var_list.Count];
-                       resolved_vars = new Expression [var_list.Count];
-                       assign = new ExpressionStatement [var_list.Count];
-
-                       bool need_conv = !TypeManager.ImplementsInterface (
-                               expr_type, TypeManager.idisposable_type);
-
-                       foreach (DictionaryEntry e in var_list){
+                       for (int i = 0; i < assign.Length; ++i) {
+                               DictionaryEntry e = (DictionaryEntry) var_list [i];
                                Expression var = (Expression) e.Key;
+                               Expression new_expr = (Expression) e.Value;
 
-                               var = var.ResolveLValue (ec, new EmptyExpression (), loc);
-                               if (var == null)
+                               Expression a = new Assign (var, new_expr, loc);
+                               a = a.Resolve (ec);
+                               if (a == null)
                                        return false;
 
                                resolved_vars [i] = var;
+                               assign [i] = a;
 
-                               if (!need_conv) {
-                                       i++;
+                               if (TypeManager.ImplementsInterface (a.Type, TypeManager.idisposable_type)) {
+                                       converted_vars [i] = var;
                                        continue;
                                }
 
-                               converted_vars [i] = Convert.ImplicitConversion (
-                                       ec, var, TypeManager.idisposable_type, loc);
-
-                               if (converted_vars [i] == null) {
-                                       Error_IsNotConvertibleToIDisposable ();
+                               a = Convert.ImplicitConversion (ec, a, TypeManager.idisposable_type, var.Location);
+                               if (a == null) {
+                                       Error_IsNotConvertibleToIDisposable (var);
                                        return false;
                                }
 
-                               i++;
-                       }
-
-                       i = 0;
-                       foreach (DictionaryEntry e in var_list){
-                               Expression var = resolved_vars [i];
-                               Expression new_expr = (Expression) e.Value;
-                               Expression a;
-
-                               a = new Assign (var, new_expr, loc);
-                               a = a.Resolve (ec);
-                               if (a == null)
-                                       return false;
-
-                               if (!need_conv)
-                                       converted_vars [i] = var;
-                               assign [i] = (ExpressionStatement) a;
-                               i++;
+                               converted_vars [i] = a;
                        }
 
                        return true;
                }
 
-               void Error_IsNotConvertibleToIDisposable ()
+               static void Error_IsNotConvertibleToIDisposable (Expression expr)
                {
-                       Report.Error (1674, loc, "`{0}': type used in a using statement must be implicitly convertible to `System.IDisposable'",
-                               TypeManager.CSharpName (expr_type));
+                       Report.SymbolRelatedToPreviousError (expr.Type);
+                       Report.Error (1674, expr.Location, "`{0}': type used in a using statement must be implicitly convertible to `System.IDisposable'",
+                               expr.GetSignatureForError ());
                }
 
                bool ResolveExpression (EmitContext ec)
                {
                        if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
                                if (Convert.ImplicitConversion (ec, expr, TypeManager.idisposable_type, loc) == null) {
-                                       Error_IsNotConvertibleToIDisposable ();
+                                       Error_IsNotConvertibleToIDisposable (expr);
                                        return false;
                                }
                        }
@@ -4578,7 +4468,7 @@ namespace Mono.CSharp {
                        int i = 0;
 
                        for (i = 0; i < assign.Length; i++) {
-                               assign [i].EmitStatement (ec);
+                               assign [i].Emit (ec);
 
                                if (emit_finally)
                                        ig.BeginExceptionBlock ();
@@ -4731,11 +4621,6 @@ namespace Mono.CSharp {
 
                        bool ok = Statement.Resolve (ec);
 
-                       if (!ok) {
-                               ec.KillFlowBranching ();
-                               return false;
-                       }
-
                        ResolveFinally (branching);
 
                        ec.EndFlowBranching ();
@@ -4744,7 +4629,7 @@ namespace Mono.CSharp {
                        // So, ensure there's some IL code after the finally block.
                        ec.NeedReturnLabel ();
 
-                       return true;
+                       return ok;
                }
                
                protected override void DoEmit (EmitContext ec)
@@ -4807,18 +4692,11 @@ namespace Mono.CSharp {
                        if (expr == null)
                                return false;
 
-                       Constant c = expr as Constant;
-                       if (c != null && c.GetValue () == null) {
+                       if (expr.Type == TypeManager.null_type) {
                                Report.Error (186, loc, "Use of null is not valid in this context");
                                return false;
                        }
 
-                       TypeExpr texpr = type.ResolveAsTypeTerminal (ec, false);
-                       if (texpr == null)
-                               return false;
-
-                       Type var_type = texpr.Type;
-
                        if (expr.eclass == ExprClass.MethodGroup || expr is AnonymousMethodExpression) {
                                Report.Error (446, expr.Location, "Foreach statement cannot operate on a `{0}'",
                                        expr.ExprClassName);
@@ -4839,13 +4717,12 @@ namespace Mono.CSharp {
                        }
 
                        if (expr.Type.IsArray) {
-                               array = new ArrayForeach (var_type, variable, expr, statement, loc);
+                               array = new ArrayForeach (type, variable, expr, statement, loc);
                                return array.Resolve (ec);
-                       } else {
-                               collection = new CollectionForeach (
-                                       var_type, variable, expr, statement, loc);
-                               return collection.Resolve (ec);
                        }
+                       
+                       collection = new CollectionForeach (type, variable, expr, statement, loc);
+                       return collection.Resolve (ec);
                }
 
                protected override void DoEmit (EmitContext ec)
@@ -4893,7 +4770,7 @@ namespace Mono.CSharp {
                        Expression variable, expr, conv;
                        Statement statement;
                        Type array_type;
-                       Type var_type;
+                       Expression var_type;
                        TemporaryVariable[] lengths;
                        ArrayCounter[] counter;
                        int rank;
@@ -4901,7 +4778,7 @@ namespace Mono.CSharp {
                        TemporaryVariable copy;
                        Expression access;
 
-                       public ArrayForeach (Type var_type, Expression var,
+                       public ArrayForeach (Expression var_type, Expression var,
                                             Expression expr, Statement stmt, Location l)
                        {
                                this.var_type = var_type;
@@ -4937,7 +4814,17 @@ namespace Mono.CSharp {
                                if (access == null)
                                        return false;
 
-                               conv = Convert.ExplicitConversion (ec, access, var_type, loc);
+                               VarExpr ve = var_type as VarExpr;
+                               if (ve != null) {
+                                       // Infer implicitly typed local variable from foreach array type
+                                       var_type = new TypeExpression (access.Type, ve.Location);
+                               }
+
+                               var_type = var_type.ResolveAsTypeTerminal (ec, false);
+                               if (var_type == null)
+                                       return false;
+
+                               conv = Convert.ExplicitConversion (ec, access, var_type.Type, loc);
                                if (conv == null)
                                        return false;
 
@@ -5019,11 +4906,12 @@ namespace Mono.CSharp {
                        MethodGroupExpr get_enumerator;
                        PropertyExpr get_current;
                        MethodInfo move_next;
-                       Type var_type, enumerator_type;
+                       Expression var_type;
+                       Type enumerator_type;
                        bool is_disposable;
                        bool enumerator_found;
 
-                       public CollectionForeach (Type var_type, Expression var,
+                       public CollectionForeach (Expression var_type, Expression var,
                                                  Expression expr, Statement stmt, Location l)
                        {
                                this.var_type = var_type;
@@ -5191,7 +5079,7 @@ namespace Mono.CSharp {
                                        TypeManager.CSharpName (expr.Type));
                        }
 
-                       bool IsOverride (MethodInfo m)
+                       public static bool IsOverride (MethodInfo m)
                        {
                                m = (MethodInfo) TypeManager.DropGenericMethodArguments (m);
 
@@ -5304,24 +5192,10 @@ namespace Mono.CSharp {
                                //
                                // Now try to find the method in the interfaces
                                //
-                               while (t != null){
-                                       Type [] ifaces = t.GetInterfaces ();
-
-                                       foreach (Type i in ifaces){
-                                               if (TryType (ec, i))
-                                                       return true;
-                                       }
-                               
-                                       //
-                                       // Since TypeBuilder.GetInterfaces only returns the interface
-                                       // types for this type, we have to keep looping, but once
-                                       // we hit a non-TypeBuilder (ie, a Type), then we know we are
-                                       // done, because it returns all the types
-                                       //
-                                       if ((t is TypeBuilder))
-                                               t = t.BaseType;
-                                       else
-                                               break;
+                               Type [] ifaces = TypeManager.GetInterfaces (t);
+                               foreach (Type i in ifaces){
+                                       if (TryType (ec, i))
+                                               return true;
                                }
 
                                return false;
@@ -5337,6 +5211,16 @@ namespace Mono.CSharp {
                                        return false;
                                }
 
+                               VarExpr ve = var_type as VarExpr;
+                               if (ve != null) {
+                                       // Infer implicitly typed local variable from foreach enumerable type
+                                       var_type = new TypeExpression (get_current.PropertyInfo.PropertyType, var_type.Location);
+                               }
+
+                               var_type = var_type.ResolveAsTypeTerminal (ec, false);
+                               if (var_type == null)
+                                       return false;
+                                                               
                                enumerator = new TemporaryVariable (enumerator_type, loc);
                                enumerator.Resolve (ec);
 
@@ -5357,7 +5241,7 @@ namespace Mono.CSharp {
                                get_current.InstanceExpression = enumerator;
 
                                Statement block = new CollectionForeachStatement (
-                                       var_type, variable, get_current, statement, loc);
+                                       var_type.Type, variable, get_current, statement, loc);
 
                                loop = new While (move_next_expr, block, loc);