infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-13 20:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8233820: Test crashed with assert(phi->operand_count() != 1 || phi->subst() != phi) failed: missed trivial simplification

Browse Source 
Verification code needs to skip illegal phi functions.

Reviewed-by: thartmann, vlivanov
This commit is contained in:
Martin Doerr 2019-11-12 16:13:16 +01:00
parent d948bfd584
commit 7c242c709d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotspot/share/c1/c1_GraphBuilder.cpp
View File

@ -2590,7 +2590,7 @@ void PhiSimplifier::block_do(BlockBegin* b) {
#ifdef ASSERT
for_each_phi_fun(b, phi,
assert(phi->operand_count() != 1 || phi->subst() != phi, "missed trivial simplification");
assert(phi->operand_count() != 1 || phi->subst() != phi || phi->is_illegal(), "missed trivial simplification");
);
ValueStack* state = b->state()->caller_state();

2
src/hotspot/share/c1/c1_Optimizer.cpp
View File

@ -366,6 +366,8 @@ class BlockMerger: public BlockClosure {
assert(sux_value == end_state->stack_at(index), "stack not equal");
}
for_each_local_value(sux_state, index, sux_value) {
Phi* sux_phi = sux_value->as_Phi();
if (sux_phi != NULL && sux_phi->is_illegal()) continue;
assert(sux_value == end_state->local_at(index), "locals not equal");
}
assert(sux_state->caller_state() == end_state->caller_state(), "caller not equal");