Mercurial > hg > graal-jvmci-8
changeset 20691:03b7d9efd9fd
Merge
author | dbuck |
---|---|
date | Thu, 04 Dec 2014 07:54:25 +0000 |
parents | d4caf9c96afd (current diff) 3f4a5fdca318 (diff) |
children | bc5a90a4db47 |
files | |
diffstat | 1 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/ifg.cpp Fri Feb 28 16:00:40 2014 +0400 +++ b/src/share/vm/opto/ifg.cpp Thu Dec 04 07:54:25 2014 +0000 @@ -541,6 +541,7 @@ 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 @@ 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