Skip to content

Commit 9fe9b24

Browse files
robcaslozVladimir Ivanov
authored andcommitted
8254575: C2: Clean up unused TRACK_PHI_INPUTS assertion code
Remove assertion code that was disabled in all build configurations. Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org> Reviewed-by: vlivanov, kvn
1 parent 31d9b7f commit 9fe9b24

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

src/hotspot/share/opto/gcm.cpp

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -610,16 +610,6 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
610610
Node_List non_early_stores(area); // all relevant stores outside of early
611611
bool must_raise_LCA = false;
612612

613-
#ifdef TRACK_PHI_INPUTS
614-
// %%% This extra checking fails because MergeMem nodes are not GVNed.
615-
// Provide "phi_inputs" to check if every input to a PhiNode is from the
616-
// original memory state. This indicates a PhiNode for which should not
617-
// prevent the load from sinking. For such a block, set_raise_LCA_mark
618-
// may be overly conservative.
619-
// Mechanism: count inputs seen for each Phi encountered in worklist_store.
620-
DEBUG_ONLY(GrowableArray<uint> phi_inputs(area, C->unique(),0,0));
621-
#endif
622-
623613
// 'load' uses some memory state; look for users of the same state.
624614
// Recurse through MergeMem nodes to the stores that use them.
625615

@@ -761,19 +751,6 @@ Block* PhaseCFG::insert_anti_dependences(Block* LCA, Node* load, bool verify) {
761751
}
762752
}
763753
assert(found_match, "no worklist bug");
764-
#ifdef TRACK_PHI_INPUTS
765-
#ifdef ASSERT
766-
// This assert asks about correct handling of PhiNodes, which may not
767-
// have all input edges directly from 'mem'. See BugId 4621264
768-
int num_mem_inputs = phi_inputs.at_grow(store->_idx,0) + 1;
769-
// Increment by exactly one even if there are multiple copies of 'mem'
770-
// coming into the phi, because we will run this block several times
771-
// if there are several copies of 'mem'. (That's how DU iterators work.)
772-
phi_inputs.at_put(store->_idx, num_mem_inputs);
773-
assert(PhiNode::Input + num_mem_inputs < store->req(),
774-
"Expect at least one phi input will not be from original memory state");
775-
#endif //ASSERT
776-
#endif //TRACK_PHI_INPUTS
777754
} else if (store_block != early) {
778755
// 'store' is between the current LCA and earliest possible block.
779756
// Label its block, and decide later on how to raise the LCA

0 commit comments

Comments
 (0)