diff src/share/vm/opto/postaloc.cpp @ 7206:d2f8c38e543d

Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents 2aff40cb4703
children 8373c19be854
line wrap: on
line diff
--- a/src/share/vm/opto/postaloc.cpp	Fri Nov 30 17:00:32 2012 -0800
+++ b/src/share/vm/opto/postaloc.cpp	Fri Dec 07 01:09:03 2012 -0800
@@ -146,7 +146,7 @@
       }
     }
     // Disconnect control and remove precedence edges if any exist
-    old->disconnect_inputs(NULL);
+    old->disconnect_inputs(NULL, C);
   }
   return blk_adjust;
 }
@@ -513,7 +513,7 @@
         b->_nodes.remove(j--); phi_dex--;
         _cfg._bbs.map(phi->_idx,NULL);
         phi->replace_by(u);
-        phi->disconnect_inputs(NULL);
+        phi->disconnect_inputs(NULL, C);
         continue;
       }
       // Note that if value[pidx] exists, then we merged no new values here