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

6591247: C2 cleans up the merge point too early during SplitIf

Browse Source 
Remove region self reference last

Reviewed-by: kvn, never
This commit is contained in:
Igor Veresov 2011-08-27 00:23:47 -07:00
parent 6446205688
commit ec3f90d1b4
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hotspot/src/share/vm/opto/split_if.cpp
View File

@ -500,19 +500,14 @@ void PhaseIdealLoop::do_split_if( Node *iff ) {
region_cache.lru_insert( new_false, new_false ); region_cache.lru_insert( new_false, new_false );
region_cache.lru_insert( new_true , new_true ); region_cache.lru_insert( new_true , new_true );
// Now handle all uses of the splitting block // Now handle all uses of the splitting block
for (DUIterator_Last kmin, k = region->last_outs(kmin); k >= kmin; --k) { for (DUIterator k = region->outs(); region->has_out(k); k++) {
Node* phi = region->last_out(k); Node* phi = region->out(k);
if( !phi->in(0) ) { // Dead phi? Remove it if (!phi->in(0)) { // Dead phi? Remove it
_igvn.remove_dead_node(phi); _igvn.remove_dead_node(phi);
continue; } else if (phi == region) { // Found the self-reference
} continue; // No roll-back of DUIterator
assert( phi->in(0) == region, "" ); } else if (phi->is_Phi()) { // Expected common case: Phi hanging off of Region
if( phi == region ) { // Found the self-reference assert(phi->in(0) == region, "Inconsistent graph");
phi->set_req(0, NULL);
continue; // Break the self-cycle
}
// Expected common case: Phi hanging off of Region
if( phi->is_Phi() ) {
// Need a per-def cache. Phi represents a def, so make a cache // Need a per-def cache. Phi represents a def, so make a cache
small_cache phi_cache; small_cache phi_cache;
@ -524,23 +519,25 @@ void PhaseIdealLoop::do_split_if( Node *iff ) {
// collection of PHI's merging values from different paths. The Phis // collection of PHI's merging values from different paths. The Phis
// inserted depend only on the location of the USE. We use a // inserted depend only on the location of the USE. We use a
// 2-element cache to handle multiple uses from the same block. // 2-element cache to handle multiple uses from the same block.
handle_use( use, phi, &phi_cache, region_dom, new_false, new_true, old_false, old_true ); handle_use(use, phi, &phi_cache, region_dom, new_false, new_true, old_false, old_true);
} // End of while phi has uses } // End of while phi has uses
// Because handle_use might relocate region->_out,
// we must refresh the iterator.
k = region->last_outs(kmin);
// Remove the dead Phi // Remove the dead Phi
_igvn.remove_dead_node( phi ); _igvn.remove_dead_node( phi );
} else { } else {
assert(phi->in(0) == region, "Inconsistent graph");
// Random memory op guarded by Region. Compute new DEF for USE. // Random memory op guarded by Region. Compute new DEF for USE.
handle_use( phi, region, &region_cache, region_dom, new_false, new_true, old_false, old_true ); handle_use(phi, region, &region_cache, region_dom, new_false, new_true, old_false, old_true);
} }
// Every path above deletes a use of the region, except for the region
// self-cycle (which is needed by handle_use calling find_use_block
// calling get_ctrl calling get_ctrl_no_update looking for dead
// regions). So roll back the DUIterator innards.
--k;
} // End of while merge point has phis } // End of while merge point has phis
assert(region->outcnt() == 1, "Only self reference should remain"); // Just Self on the Region
region->set_req(0, NULL); // Break the self-cycle
// Any leftover bits in the splitting block must not have depended on local // Any leftover bits in the splitting block must not have depended on local
// Phi inputs (these have already been split-up). Hence it's safe to hoist // Phi inputs (these have already been split-up). Hence it's safe to hoist
// these guys to the dominating point. // these guys to the dominating point.