diff src/share/vm/opto/loopTransform.cpp @ 6646:c38f13903fdf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ just before the NPG (no perm gen) changeset
author Doug Simon <doug.simon@oracle.com>
date Mon, 29 Oct 2012 21:10:04 +0100
parents 0acd345fd810
children e626685e9f6c 521c82b9cbf8
line wrap: on
line diff
--- a/src/share/vm/opto/loopTransform.cpp	Mon Oct 29 20:02:54 2012 +0100
+++ b/src/share/vm/opto/loopTransform.cpp	Mon Oct 29 21:10:04 2012 +0100
@@ -547,11 +547,6 @@
     Node *nnn = old_new[old->_idx];
     if (!has_ctrl(nnn))
       set_idom(nnn, idom(nnn), dd-1);
-    // While we're at it, remove any SafePoints from the peeled code
-    if (old->Opcode() == Op_SafePoint) {
-      Node *nnn = old_new[old->_idx];
-      lazy_replace(nnn,nnn->in(TypeFunc::Control));
-    }
   }
 
   // Now force out all loop-invariant dominating tests.  The optimizer