Merge

src/share/vm/opto/ifg.cpp

@@ -541,6 +541,7 @@ uint PhaseChaitin::build_ifg_physical( ResourceArea *a ) {
           if( !n->is_Proj() ||
               // Could also be a flags-projection of a dead ADD or such.
               (_lrg_map.live_range_id(def) && !liveout.member(_lrg_map.live_range_id(def)))) {
+            bool remove = true;
             if (n->is_MachProj()) {
               // Don't remove KILL projections if their "defining" nodes have
               // memory effects (have SCMemProj projection node) -
@@ -553,21 +554,24 @@ uint PhaseChaitin::build_ifg_physical( ResourceArea *a ) {
               for (uint i = 0; i < cnt; i++) {
                 Node* proj = def->raw_out(i);
                 if (proj->Opcode() == Op_SCMemProj) {
-                  return false;
+                  remove = false;
+                  break;
                 }
               }
             }
-            block->remove_node(j - 1);
-            if (lrgs(r)._def == n) {
-              lrgs(r)._def = 0;
+            if (remove) {
+              block->remove_node(j - 1);
+              if (lrgs(r)._def == n) {
+                lrgs(r)._def = 0;
+              }
+              n->disconnect_inputs(NULL, C);
+              _cfg.unmap_node_from_block(n);
+              n->replace_by(C->top());
+              // Since yanking a Node from block, high pressure moves up one
+              hrp_index[0]--;
+              hrp_index[1]--;
+              continue;
             }
-            n->disconnect_inputs(NULL, C);
-            _cfg.unmap_node_from_block(n);
-            n->replace_by(C->top());
-            // Since yanking a Node from block, high pressure moves up one
-            hrp_index[0]--;
-            hrp_index[1]--;
-            continue;
           }
 
           // Fat-projections kill many registers which cannot be used to