2005-05-12 Jordi Mas i Hernandez <jordi@ximian.com>
[mono.git] / mcs / mcs / flowanalysis.cs
index e08ce75e94333783bfb0ab870f44934ee6f88e07..d46f3c09a1872bb6b210be120539d3cad66fa3d3 100644 (file)
@@ -79,7 +79,7 @@ namespace Mono.CSharp
 
                public sealed class Reachability
                {
-                       FlowReturns returns, breaks, throws, barrier, reachable;
+                       FlowReturns returns, breaks, throws, barrier;
 
                        public FlowReturns Returns {
                                get { return returns; }
@@ -93,10 +93,6 @@ namespace Mono.CSharp
                        public FlowReturns Barrier {
                                get { return barrier; }
                        }
-                       public FlowReturns Reachable {
-                               get { return reachable; }
-                       }
-
                        public Reachability (FlowReturns returns, FlowReturns breaks,
                                             FlowReturns throws, FlowReturns barrier)
                        {
@@ -104,15 +100,11 @@ namespace Mono.CSharp
                                this.breaks = breaks;
                                this.throws = throws;
                                this.barrier = barrier;
-
-                               update ();
                        }
 
                        public Reachability Clone ()
                        {
-                               Reachability cloned = new Reachability (returns, breaks, throws, barrier);
-                               cloned.reachable = reachable;
-                               return cloned;
+                               return new Reachability (returns, breaks, throws, barrier);
                        }
 
                        // <summary>
@@ -231,7 +223,12 @@ namespace Mono.CSharp
                                a.throws = AndFlowReturns (a.throws, b.throws);
                                a.barrier = AndFlowReturns (a.barrier, b.barrier);
 
-                               a.reachable = AndFlowReturns (a.reachable, b.reachable);
+                               if (a_unreachable && b_unreachable)
+                                       a.barrier = FlowReturns.Always;
+                               else if (a_unreachable || b_unreachable)
+                                       a.barrier = FlowReturns.Sometimes;
+                               else
+                                       a.barrier = FlowReturns.Never;
                        }
 
                        public void Or (Reachability b)
@@ -240,8 +237,6 @@ namespace Mono.CSharp
                                breaks = OrFlowReturns (breaks, b.breaks);
                                throws = OrFlowReturns (throws, b.throws);
                                barrier = OrFlowReturns (barrier, b.barrier);
-
-                               update ();
                        }
 
                        public static Reachability Never ()
@@ -251,16 +246,21 @@ namespace Mono.CSharp
                                        FlowReturns.Never, FlowReturns.Never);
                        }
 
-                       void update ()
-                       {
-                               if ((returns == FlowReturns.Always) || (breaks == FlowReturns.Always) ||
-                                   (throws == FlowReturns.Always) || (barrier == FlowReturns.Always))
-                                       reachable = FlowReturns.Never;
-                               else if ((returns == FlowReturns.Never) && (breaks == FlowReturns.Never) &&
-                                        (throws == FlowReturns.Never) && (barrier == FlowReturns.Never))
-                                       reachable = FlowReturns.Always;
-                               else
-                                       reachable = FlowReturns.Sometimes;
+                       public FlowReturns Reachable {
+                               get {
+                                       if ((returns == FlowReturns.Always) ||
+                                           (breaks == FlowReturns.Always) ||
+                                           (throws == FlowReturns.Always) ||
+                                           (barrier == FlowReturns.Always))
+                                               return FlowReturns.Never;
+                                       else if ((returns == FlowReturns.Never) &&
+                                                (breaks == FlowReturns.Never) &&
+                                                (throws == FlowReturns.Never) &&
+                                                (barrier == FlowReturns.Never))
+                                               return FlowReturns.Always;
+                                       else
+                                               return FlowReturns.Sometimes;
+                               }
                        }
 
                        public bool AlwaysBreaks {
@@ -296,43 +296,47 @@ namespace Mono.CSharp
                        }
 
                        public bool IsUnreachable {
-                               get { return reachable == FlowReturns.Never; }
+                               get { return Reachable == FlowReturns.Never; }
                        }
 
                        public void SetReturns ()
                        {
                                returns = FlowReturns.Always;
-                               update ();
                        }
 
                        public void SetReturnsSometimes ()
                        {
                                returns = FlowReturns.Sometimes;
-                               update ();
                        }
 
                        public void SetBreaks ()
                        {
                                breaks = FlowReturns.Always;
-                               update ();
                        }
 
                        public void ResetBreaks ()
                        {
                                breaks = FlowReturns.Never;
-                               update ();
                        }
 
                        public void SetThrows ()
                        {
                                throws = FlowReturns.Always;
-                               update ();
+                       }
+
+                       public void SetThrowsSometimes ()
+                       {
+                               throws = FlowReturns.Sometimes;
                        }
 
                        public void SetBarrier ()
                        {
                                barrier = FlowReturns.Always;
-                               update ();
+                       }
+
+                       public void ResetBarrier ()
+                       {
+                               barrier = FlowReturns.Never;
                        }
 
                        static string ShortName (FlowReturns returns)
@@ -352,7 +356,7 @@ namespace Mono.CSharp
                                return String.Format ("[{0}:{1}:{2}:{3}:{4}]",
                                                      ShortName (returns), ShortName (breaks),
                                                      ShortName (throws), ShortName (barrier),
-                                                     ShortName (reachable));
+                                                     ShortName (Reachable));
                        }
                }
 
@@ -360,7 +364,7 @@ namespace Mono.CSharp
                {
                        switch (type) {
                        case BranchingType.Exception:
-                               return new FlowBranchingException (parent, block, loc);
+                               throw new InvalidOperationException ();
 
                        case BranchingType.Switch:
                                return new FlowBranchingBlock (parent, type, SiblingType.SwitchSection, block, loc);
@@ -371,6 +375,9 @@ namespace Mono.CSharp
                        case BranchingType.Block:
                                return new FlowBranchingBlock (parent, type, SiblingType.Block, block, loc);
 
+                       case BranchingType.Loop:
+                               return new FlowBranchingLoop (parent, block, loc);
+
                        default:
                                return new FlowBranchingBlock (parent, type, SiblingType.Conditional, block, loc);
                        }
@@ -425,6 +432,11 @@ namespace Mono.CSharp
                        // </summary>
                        public readonly Location Location;
 
+                       // <summary>
+                       //   This is only valid for SwitchSection, Try, Catch and Finally.
+                       // </summary>
+                       public readonly Block Block;
+
                        // <summary>
                        //   If this is true, then the usage vector has been modified and must be
                        //   merged when we're done with this branching.
@@ -465,9 +477,12 @@ namespace Mono.CSharp
                        //
                        // Normally, you should not use any of these constructors.
                        //
-                       public UsageVector (SiblingType type, UsageVector parent, Location loc, int num_params, int num_locals)
+                       public UsageVector (SiblingType type, UsageVector parent,
+                                           Block block, Location loc,
+                                           int num_params, int num_locals)
                        {
                                this.Type = type;
+                               this.Block = block;
                                this.Location = loc;
                                this.InheritsFrom = parent;
                                this.CountParameters = num_params;
@@ -494,15 +509,19 @@ namespace Mono.CSharp
                                id = ++next_id;
                        }
 
-                       public UsageVector (SiblingType type, UsageVector parent, Location loc)
-                               : this (type, parent, loc, parent.CountParameters, parent.CountLocals)
+                       public UsageVector (SiblingType type, UsageVector parent,
+                                           Block block, Location loc)
+                               : this (type, parent, block, loc,
+                                       parent.CountParameters, parent.CountLocals)
                        { }
 
                        public UsageVector (MyBitVector parameters, MyBitVector locals,
-                                           Reachability reachability, Location loc)
+                                           Reachability reachability, Block block,
+                                           Location loc)
                        {
                                this.Type = SiblingType.Block;
                                this.Location = loc;
+                               this.Block = block;
 
                                this.reachability = reachability;
                                this.parameters = parameters;
@@ -516,7 +535,9 @@ namespace Mono.CSharp
                        // </summary>
                        public UsageVector Clone ()
                        {
-                               UsageVector retval = new UsageVector (Type, null, Location, CountParameters, CountLocals);
+                               UsageVector retval = new UsageVector (
+                                       Type, null, Block, Location,
+                                       CountParameters, CountLocals);
 
                                if (retval.locals != null)
                                        retval.locals = locals.Clone ();
@@ -531,7 +552,7 @@ namespace Mono.CSharp
 
                        public bool IsAssigned (VariableInfo var)
                        {
-                               if (!var.IsParameter && Reachability.AlwaysBreaks)
+                               if (!var.IsParameter && Reachability.IsUnreachable)
                                        return true;
 
                                return var.IsAssigned (var.IsParameter ? parameters : locals);
@@ -539,7 +560,7 @@ namespace Mono.CSharp
 
                        public void SetAssigned (VariableInfo var)
                        {
-                               if (!var.IsParameter && Reachability.AlwaysBreaks)
+                               if (!var.IsParameter && Reachability.IsUnreachable)
                                        return;
 
                                IsDirty = true;
@@ -548,7 +569,7 @@ namespace Mono.CSharp
 
                        public bool IsFieldAssigned (VariableInfo var, string name)
                        {
-                               if (!var.IsParameter && Reachability.AlwaysBreaks)
+                               if (!var.IsParameter && Reachability.IsUnreachable)
                                        return true;
 
                                return var.IsFieldAssigned (var.IsParameter ? parameters : locals, name);
@@ -556,7 +577,7 @@ namespace Mono.CSharp
 
                        public void SetFieldAssigned (VariableInfo var, string name)
                        {
-                               if (!var.IsParameter && Reachability.AlwaysBreaks)
+                               if (!var.IsParameter && Reachability.IsUnreachable)
                                        return;
 
                                IsDirty = true;
@@ -608,7 +629,7 @@ namespace Mono.CSharp
                        {
                                UsageVector result = branching.Merge ();
 
-                               Report.Debug (2, "  MERGING CHILD", this, IsDirty,
+                               Report.Debug (2, "  MERGING CHILD", this, branching, IsDirty,
                                              result.ParameterVector, result.LocalVector,
                                              result.Reachability, reachability, Type);
 
@@ -634,9 +655,20 @@ namespace Mono.CSharp
                                                        // We're either finite or we may leave the loop.
                                                        new_r.SetReturnsSometimes ();
                                                }
+                                               if (new_r.Throws == FlowReturns.Always) {
+                                                       // We're either finite or we may leave the loop.
+                                                       new_r.SetThrowsSometimes ();
+                                               }
+
+                                               if (!new_r.MayReturn && !new_r.MayThrow)
+                                                       new_r.ResetBarrier ();
                                        }
-                               } else if (branching.Type == BranchingType.Switch)
+                               } else if (branching.Type == BranchingType.Switch) {
+                                       if (new_r.MayBreak || new_r.MayReturn)
+                                               new_r.ResetBarrier ();
+
                                        new_r.ResetBreaks ();
+                               }
 
                                //
                                // We've now either reached the point after the branching or we will
@@ -660,7 +692,10 @@ namespace Mono.CSharp
                                if (result.ParameterVector != null)
                                        parameters.Or (result.ParameterVector);
 
-                               reachability.Or (new_r);
+                               if ((branching.Type == BranchingType.Block) && branching.Block.Implicit)
+                                       reachability = new_r.Clone ();
+                               else
+                                       reachability.Or (new_r);
 
                                Report.Debug (2, "  MERGING CHILD DONE", this, result,
                                              new_r, reachability);
@@ -714,19 +749,23 @@ namespace Mono.CSharp
                        //      8     Console.WriteLine (a);
                        //
                        // </summary>
-                       public void MergeJumpOrigins (ICollection origin_vectors)
+                       public void MergeJumpOrigins (UsageVector o_vectors)
                        {
                                Report.Debug (1, "  MERGING JUMP ORIGINS", this);
 
                                reachability = Reachability.Never ();
 
-                               if (origin_vectors == null)
+                               if (o_vectors == null) {
+                                       reachability.SetBarrier ();
                                        return;
+                               }
 
                                bool first = true;
 
-                               foreach (UsageVector vector in origin_vectors) {
-                                       Report.Debug (1, "    MERGING JUMP ORIGIN", vector);
+                               for (UsageVector vector = o_vectors; vector != null;
+                                    vector = vector.Next) {
+                                       Report.Debug (1, "  MERGING JUMP ORIGIN", vector,
+                                                     first, locals, vector.Locals);
 
                                        if (first) {
                                                if (locals != null && vector.Locals != null)
@@ -736,13 +775,15 @@ namespace Mono.CSharp
                                                        parameters.Or (vector.parameters);
                                                first = false;
                                        } else {
-                                               if (locals != null && vector.Locals != null)
+                                               if (locals != null)
                                                        locals.And (vector.locals);
                                                if (parameters != null)
                                                        parameters.And (vector.parameters);
                                        }
                                                
                                        Reachability.And (ref reachability, vector.Reachability, true);
+
+                                       Report.Debug (1, "  MERGING JUMP ORIGIN #1", vector);
                                }
 
                                Report.Debug (1, "  MERGING JUMP ORIGINS DONE", this);
@@ -770,6 +811,37 @@ namespace Mono.CSharp
                                Report.Debug (1, "  MERGING FINALLY ORIGIN DONE", this);
                        }
 
+                       public void MergeBreakOrigins (FlowBranching branching, UsageVector o_vectors)
+                       {
+                               Report.Debug (1, "  MERGING BREAK ORIGINS", this);
+
+                               if (o_vectors == null)
+                                       return;
+
+                               bool first = branching.Infinite;
+
+                               for (UsageVector vector = o_vectors; vector != null;
+                                    vector = vector.Next) {
+                                       Report.Debug (1, "    MERGING BREAK ORIGIN", vector);
+
+                                       if (first) {
+                                               if (locals != null && vector.Locals != null)
+                                                       locals.Or (vector.locals);
+                                               
+                                               if (parameters != null)
+                                                       parameters.Or (vector.parameters);
+                                               first = false;
+                                       } else {
+                                               if (locals != null && vector.Locals != null)
+                                                       locals.And (vector.locals);
+                                               if (parameters != null)
+                                                       parameters.And (vector.parameters);
+                                       }
+                               }
+
+                               Report.Debug (1, "  MERGING BREAK ORIGINS DONE", this);
+                       }
+
                        public void CheckOutParameters (FlowBranching branching)
                        {
                                if (parameters != null)
@@ -853,6 +925,8 @@ namespace Mono.CSharp
                                StringBuilder sb = new StringBuilder ();
 
                                sb.Append ("Vector (");
+                               sb.Append (Type);
+                               sb.Append (",");
                                sb.Append (id);
                                sb.Append (",");
                                sb.Append (IsDirty);
@@ -891,13 +965,14 @@ namespace Mono.CSharp
                                local_map = Block.LocalMap;
 
                                UsageVector parent_vector = parent != null ? parent.CurrentUsageVector : null;
-                               vector = new UsageVector (stype, parent_vector, loc, param_map.Length, local_map.Length);
-                               
-
+                               vector = new UsageVector (
+                                       stype, parent_vector, Block, loc,
+                                       param_map.Length, local_map.Length);
                        } else {
                                param_map = Parent.param_map;
                                local_map = Parent.local_map;
-                               vector = new UsageVector (stype, Parent.CurrentUsageVector, loc);
+                               vector = new UsageVector (
+                                       stype, Parent.CurrentUsageVector, null, loc);
                        }
 
                        AddSibling (vector);
@@ -910,16 +985,34 @@ namespace Mono.CSharp
                // <summary>
                //   Creates a sibling of the current usage vector.
                // </summary>
-               public virtual void CreateSibling (SiblingType type)
+               public virtual void CreateSibling (Block block, SiblingType type)
                {
-                       AddSibling (new UsageVector (type, Parent.CurrentUsageVector, Location));
+                       UsageVector vector = new UsageVector (
+                               type, Parent.CurrentUsageVector, block, Location);
+                       AddSibling (vector);
 
                        Report.Debug (1, "  CREATED SIBLING", CurrentUsageVector);
                }
 
+               public void CreateSibling ()
+               {
+                       CreateSibling (null, SiblingType.Conditional);
+               }
+
                protected abstract void AddSibling (UsageVector uv);
 
-               public abstract void Label (ArrayList origin_vectors);
+               public virtual LabeledStatement LookupLabel (string name, Location loc)
+               {
+                       if (Parent != null)
+                               return Parent.LookupLabel (name, loc);
+
+                       Report.Error (
+                               159, loc,
+                               "No such label `" + name + "' in this scope");
+                       return null;
+               }
+
+               public abstract void Label (UsageVector origin_vectors);
 
                // <summary>
                //   Check whether all `out' parameters have been assigned.
@@ -937,7 +1030,7 @@ namespace Mono.CSharp
 
                                Report.Error (177, loc, "The out parameter `" +
                                              var.Name + "' must be " +
-                                             "assigned before control leave the current method.");
+                                             "assigned before control leaves the current method.");
                        }
                }
 
@@ -1000,14 +1093,16 @@ namespace Mono.CSharp
                                // 
                                bool do_break_2 = (child.Type != SiblingType.Block) &&
                                        (child.Type != SiblingType.SwitchSection);
-                               bool unreachable = (do_break_2 && child.Reachability.AlwaysBreaks) ||
-                                       child.Reachability.AlwaysThrows ||
+                               bool always_throws = (child.Type != SiblingType.Try) &&
+                                       child.Reachability.AlwaysThrows;
+                               bool unreachable = always_throws ||
+                                       (do_break_2 && child.Reachability.AlwaysBreaks) ||
                                        child.Reachability.AlwaysReturns ||
                                        child.Reachability.AlwaysHasBarrier;
 
                                Report.Debug (2, "    MERGING SIBLING #1", reachability,
                                              Type, child.Type, child.Reachability.IsUnreachable,
-                                             do_break_2, unreachable);
+                                             do_break_2, always_throws, unreachable);
 
                                if (!unreachable && (child.LocalVector != null))
                                        MyBitVector.And (ref locals, child.LocalVector);
@@ -1026,7 +1121,8 @@ namespace Mono.CSharp
                        Report.Debug (2, "  MERGING SIBLINGS DONE", parameters, locals,
                                      reachability, Infinite);
 
-                       return new UsageVector (parameters, locals, reachability, Location);
+                       return new UsageVector (
+                               parameters, locals, reachability, null, Location);
                }
 
                protected abstract UsageVector Merge ();
@@ -1048,13 +1144,15 @@ namespace Mono.CSharp
                                throw new NotSupportedException ();
 
                        UsageVector vector = new UsageVector (
-                               SiblingType.Conditional, null, Location, param_map.Length, local_map.Length);
+                               SiblingType.Block, null, Block, Location,
+                               param_map.Length, local_map.Length);
 
                        UsageVector result = vector.MergeChild (this);
 
                        Report.Debug (4, "MERGE TOP BLOCK", Location, vector, result.Reachability);
 
-                       if (vector.Reachability.Throws != FlowReturns.Always)
+                       if ((vector.Reachability.Throws != FlowReturns.Always) &&
+                           (vector.Reachability.Barrier != FlowReturns.Always))
                                CheckOutParameters (vector.Parameters, Location);
 
                        return result.Reachability;
@@ -1076,29 +1174,11 @@ namespace Mono.CSharp
                                return false;
                }
 
-               //
-               // Checks whether we're in a `catch' block.
-               //
-               public virtual bool InCatch ()
+               public virtual bool InTryWithCatch ()
                {
                        if (Parent != null)
-                               return Parent.InCatch ();
-                       else
-                               return false;
-               }
-
-               //
-               // Checks whether we're in a `finally' block.
-               //
-               public virtual bool InFinally (bool is_return)
-               {
-                       if (!is_return &&
-                           ((Type == BranchingType.Loop) || (Type == BranchingType.Switch)))
-                               return false;
-                       else if (Parent != null)
-                               return Parent.InFinally (is_return);
-                       else
-                               return false;
+                               return Parent.InTryWithCatch ();
+                       return false;
                }
 
                public virtual bool InLoop ()
@@ -1139,6 +1219,20 @@ namespace Mono.CSharp
                                throw new NotSupportedException ();
                }
 
+               public virtual void AddBreakVector (UsageVector vector)
+               {
+                       if (Parent != null)
+                               Parent.AddBreakVector (vector);
+                       else if ((Block == null) || !Block.IsDestructor)
+                               throw new NotSupportedException ();
+               }
+
+               public virtual void StealFinallyClauses (ref ArrayList list)
+               {
+                       if (Parent != null)
+                               Parent.StealFinallyClauses (ref list);
+               }
+
                public bool IsAssigned (VariableInfo vi)
                {
                        return CurrentUsageVector.IsAssigned (vi);
@@ -1212,12 +1306,24 @@ namespace Mono.CSharp
                        sibling_list = sibling;
                }
 
-               public override void Label (ArrayList origin_vectors)
+               public override LabeledStatement LookupLabel (string name, Location loc)
+               {
+                       if (Block == null)
+                               return base.LookupLabel (name, loc);
+
+                       LabeledStatement s = Block.LookupLabel (name);
+                       if (s != null)
+                               return s;
+
+                       return base.LookupLabel (name, loc);
+               }
+
+               public override void Label (UsageVector origin_vectors)
                {
                        if (!CurrentUsageVector.Reachability.IsUnreachable) {
-                               if (origin_vectors == null)
-                                       origin_vectors = new ArrayList (1);
-                               origin_vectors.Add (CurrentUsageVector.Clone ());
+                               UsageVector vector = CurrentUsageVector.Clone ();
+                               vector.Next = origin_vectors;
+                               origin_vectors = vector;
                        }
 
                        CurrentUsageVector.MergeJumpOrigins (origin_vectors);
@@ -1229,32 +1335,60 @@ namespace Mono.CSharp
                }
        }
 
+       public class FlowBranchingLoop : FlowBranchingBlock
+       {
+               UsageVector break_origins;
+
+               public FlowBranchingLoop (FlowBranching parent, Block block, Location loc)
+                       : base (parent, BranchingType.Loop, SiblingType.Conditional, block, loc)
+               { }
+
+               public override void AddBreakVector (UsageVector vector)
+               {
+                       vector = vector.Clone ();
+                       vector.Next = break_origins;
+                       break_origins = vector;
+               }
+
+               protected override UsageVector Merge ()
+               {
+                       UsageVector vector = base.Merge ();
+
+                       vector.MergeBreakOrigins (this, break_origins);
+
+                       return vector;
+               }
+       }
+
        public class FlowBranchingException : FlowBranching
        {
+               ExceptionStatement stmt;
                UsageVector current_vector;
                UsageVector catch_vectors;
                UsageVector finally_vector;
                UsageVector finally_origins;
-               bool in_try;
+               bool emit_finally;
 
-               public FlowBranchingException (FlowBranching parent, Block block, Location loc)
-                       : base (parent, BranchingType.Exception, SiblingType.Try, block, loc)
-               { }
+               public FlowBranchingException (FlowBranching parent,
+                                              ExceptionStatement stmt)
+                       : base (parent, BranchingType.Exception, SiblingType.Try,
+                               null, stmt.loc)
+               {
+                       this.stmt = stmt;
+                       this.emit_finally = true;
+               }
 
                protected override void AddSibling (UsageVector sibling)
                {
                        if (sibling.Type == SiblingType.Try) {
                                sibling.Next = catch_vectors;
                                catch_vectors = sibling;
-                               in_try = true;
                        } else if (sibling.Type == SiblingType.Catch) {
                                sibling.Next = catch_vectors;
                                catch_vectors = sibling;
-                               in_try = false;
                        } else if (sibling.Type == SiblingType.Finally) {
                                sibling.MergeFinallyOrigins (finally_origins);
                                finally_vector = sibling;
-                               in_try = false;
                        } else
                                throw new InvalidOperationException ();
 
@@ -1270,14 +1404,18 @@ namespace Mono.CSharp
                        return finally_vector == null;
                }
 
-               public override bool InCatch ()
+               public override bool InTryWithCatch ()
                {
-                       return !in_try && (finally_vector == null);
-               }
+                       if (finally_vector == null) {
+                               Try t = stmt as Try;
+                               if (t != null && t.HasCatch)
+                                       return true;
+                       }
 
-               public override bool InFinally (bool is_return)
-               {
-                       return finally_vector != null;
+                       if (Parent != null)
+                               return Parent.InTryWithCatch ();
+
+                       return false;
                }
 
                public override bool BreakCrossesTryCatchBoundary ()
@@ -1292,7 +1430,39 @@ namespace Mono.CSharp
                        finally_origins = vector;
                }
 
-               public override void Label (ArrayList origin_vectors)
+               public override void StealFinallyClauses (ref ArrayList list)
+               {
+                       if (list == null)
+                               list = new ArrayList ();
+                       list.Add (stmt);
+                       emit_finally = false;
+                       base.StealFinallyClauses (ref list);
+               }
+
+               public bool EmitFinally {
+                       get { return emit_finally; }
+               }
+
+               public override LabeledStatement LookupLabel (string name, Location loc)
+               {
+                       if (current_vector.Block == null)
+                               return base.LookupLabel (name, loc);
+
+                       LabeledStatement s = current_vector.Block.LookupLabel (name);
+                       if (s != null)
+                               return s;
+
+                       if (finally_vector != null) {
+                               Report.Error (
+                                       157, loc, "Control can not leave the body " +
+                                       "of the finally block");
+                               return null;
+                       }
+
+                       return base.LookupLabel (name, loc);
+               }
+
+               public override void Label (UsageVector origin_vectors)
                {
                        CurrentUsageVector.MergeJumpOrigins (origin_vectors);
                }
@@ -1496,13 +1666,15 @@ namespace Mono.CSharp
                                if (type is TypeBuilder) {
                                        TypeContainer tc = TypeManager.LookupTypeContainer (type);
 
-                                       ArrayList fields = tc.Fields;
+                                       ArrayList fields = null;
+                                       if (tc != null)
+                                               fields = tc.Fields;
 
                                        ArrayList public_fields = new ArrayList ();
                                        ArrayList non_public_fields = new ArrayList ();
 
                                        if (fields != null) {
-                                               foreach (Field field in fields) {
+                                               foreach (FieldMember field in fields) {
                                                        if ((field.ModFlags & Modifiers.STATIC) != 0)
                                                                continue;
                                                        if ((field.ModFlags & Modifiers.PUBLIC) != 0)
@@ -2027,7 +2199,12 @@ namespace Mono.CSharp
                // </summary>
                public void And (MyBitVector new_vector)
                {
-                       BitArray new_array = new_vector.Vector;
+                       BitArray new_array;
+
+                       if (new_vector != null)
+                               new_array = new_vector.Vector;
+                       else
+                               new_array = new BitArray (Count, false);
 
                        initialize_vector ();