Author: raja
Date: 2007-05-15 10:06:52 -0400 (Tue, 15 May 2007)
New Revision: 77405

Modified:
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/statement.cs
Log:
* statement.cs (ToplevelBlock.child): Remove.


Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2007-05-15 14:02:30 UTC (rev 77404)
+++ trunk/mcs/mcs/ChangeLog     2007-05-15 14:06:52 UTC (rev 77405)
@@ -1,3 +1,7 @@
+2007-05-15  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * statement.cs (ToplevelBlock.child): Remove.
+
 2007-05-15  Raja R Harinath  <[EMAIL PROTECTED]>
 
        Rationalize ResolveMeta: refactoring

Modified: trunk/mcs/mcs/statement.cs
===================================================================
--- trunk/mcs/mcs/statement.cs  2007-05-15 14:02:30 UTC (rev 77404)
+++ trunk/mcs/mcs/statement.cs  2007-05-15 14:06:52 UTC (rev 77405)
@@ -2472,7 +2472,6 @@
                // if we are the topmost block
                //
                Block container;
-               ToplevelBlock child;    
                GenericMethod generic;
                FlowBranchingToplevel top_level_branching;
                AnonymousContainer anonymous_container;
@@ -2655,9 +2654,11 @@
                //
                public void ReParent (ToplevelBlock new_parent)
                {
+                       if ((flags & Flags.VariablesInitialized) != 0)
+                               throw new InternalErrorException ("block has 
already been resolved");
+
                        container = new_parent;
                        Parent = new_parent;
-                       new_parent.child = this;
                }
 
                //
@@ -2754,9 +2755,6 @@
 
                        ResolveMeta (this, ec, ip);
 
-                       if (child != null)
-                               child.ResolveMeta (this, ec, ip);
-
                        top_level_branching = ec.StartFlowBranching (this);
 
                        return Report.Errors == errors;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to