stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005956: C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block

Browse Source 
Disable re-materialization of reaching definitions (which have live inputs) for phi nodes when spilling.

Reviewed-by: twisti, kvn
This commit is contained in:
Niclas Adlertz 2013-06-03 12:39:33 -07:00
parent d6efb99686
commit f4682b75e5
1 changed files with 10 additions and 1 deletions

11
hotspot/src/share/vm/opto/reg_split.cpp

@ -51,6 +51,15 @@
static const char out_of_nodes[] = "out of nodes during split";
static bool contains_no_live_range_input(const Node* def) {
for (uint i = 1; i < def->req(); ++i) {
if (def->in(i) != NULL && def->in_RegMask(i).is_NotEmpty()) {
return false;
}
}
return true;
}
//------------------------------get_spillcopy_wide-----------------------------
// Get a SpillCopy node with wide-enough masks. Use the 'wide-mask', the
// wide ideal-register spill-mask if possible. If the 'wide-mask' does
@ -1312,7 +1321,7 @@ uint PhaseChaitin::Split(uint maxlrg, ResourceArea* split_arena) {
Node *def = Reaches[pidx][slidx];
assert( def, "must have reaching def" );
// If input up/down sense and reg-pressure DISagree
if( def->rematerialize() ) {
if (def->rematerialize() && contains_no_live_range_input(def)) {
// Place the rematerialized node above any MSCs created during
// phi node splitting. end_idx points at the insertion point
// so look at the node before it.