Author: raja
Date: 2007-06-02 12:19:03 -0400 (Sat, 02 Jun 2007)
New Revision: 78476

Modified:
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/statement.cs
Log:
* statement.cs (Statement.Clone): Move special case code to Block.CloneTo.


Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2007-06-02 15:03:34 UTC (rev 78475)
+++ trunk/mcs/mcs/ChangeLog     2007-06-02 16:19:03 UTC (rev 78476)
@@ -1,3 +1,8 @@
+2007-06-02  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * statement.cs (Statement.Clone): Move special case code ...
+       (Block.CloneTo): ... here.
+
 2007-05-29  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * statement.cs (ToplevelBlock.container): Remove field.  It's

Modified: trunk/mcs/mcs/statement.cs
===================================================================
--- trunk/mcs/mcs/statement.cs  2007-06-02 15:03:34 UTC (rev 78475)
+++ trunk/mcs/mcs/statement.cs  2007-06-02 16:19:03 UTC (rev 78476)
@@ -99,9 +99,6 @@
                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;
                }
@@ -2353,6 +2350,8 @@
                {
                        Block target = (Block) t;
 
+                       clonectx.AddBlockMap (this, target);
+
                        target.Toplevel = (ToplevelBlock) clonectx.LookupBlock 
(Toplevel);
                        target.Explicit = (ExplicitBlock) clonectx.LookupBlock 
(Explicit);
                        if (Parent != null)

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

Reply via email to