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

7114106: C1: assert(goto_state->is_same(sux_state)) failed: states must match now

Browse Source 
Fix C1's CEE to take inlining into account when the stacks in states are compared.

Reviewed-by: iveresov, never
This commit is contained in:
Roland Westrelin 2011-12-13 10:54:47 +01:00
parent d447f02608
commit ebdae40c34
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hotspot/src/share/vm/c1/c1_Optimizer.cpp
View File

@ -122,18 +122,25 @@ void CE_Eliminator::block_do(BlockBegin* block) {
if (sux != f_goto->default_sux()) return; if (sux != f_goto->default_sux()) return;
// check if at least one word was pushed on sux_state // check if at least one word was pushed on sux_state
// inlining depths must match
ValueStack* if_state = if_->state();
ValueStack* sux_state = sux->state(); ValueStack* sux_state = sux->state();
if (sux_state->stack_size() <= if_->state()->stack_size()) return; while (sux_state->scope() != if_state->scope()) {
if_state = if_state->caller_state();
assert(if_state != NULL, "states do not match up");
}
if (sux_state->stack_size() <= if_state->stack_size()) return;
// check if phi function is present at end of successor stack and that // check if phi function is present at end of successor stack and that
// only this phi was pushed on the stack // only this phi was pushed on the stack
Value sux_phi = sux_state->stack_at(if_->state()->stack_size()); Value sux_phi = sux_state->stack_at(if_state->stack_size());
if (sux_phi == NULL || sux_phi->as_Phi() == NULL || sux_phi->as_Phi()->block() != sux) return; if (sux_phi == NULL || sux_phi->as_Phi() == NULL || sux_phi->as_Phi()->block() != sux) return;
if (sux_phi->type()->size() != sux_state->stack_size() - if_->state()->stack_size()) return; if (sux_phi->type()->size() != sux_state->stack_size() - if_state->stack_size()) return;
// get the values that were pushed in the true- and false-branch // get the values that were pushed in the true- and false-branch
Value t_value = t_goto->state()->stack_at(if_->state()->stack_size()); Value t_value = t_goto->state()->stack_at(if_state->stack_size());
Value f_value = f_goto->state()->stack_at(if_->state()->stack_size()); Value f_value = f_goto->state()->stack_at(if_state->stack_size());
// backend does not support floats // backend does not support floats
assert(t_value->type()->base() == f_value->type()->base(), "incompatible types"); assert(t_value->type()->base() == f_value->type()->base(), "incompatible types");
@ -180,11 +187,7 @@ void CE_Eliminator::block_do(BlockBegin* block) {
Goto* goto_ = new Goto(sux, state_before, if_->is_safepoint() || t_goto->is_safepoint() || f_goto->is_safepoint()); Goto* goto_ = new Goto(sux, state_before, if_->is_safepoint() || t_goto->is_safepoint() || f_goto->is_safepoint());
// prepare state for Goto // prepare state for Goto
ValueStack* goto_state = if_->state(); ValueStack* goto_state = if_state;
while (sux_state->scope() != goto_state->scope()) {
goto_state = goto_state->caller_state();
assert(goto_state != NULL, "states do not match up");
}
goto_state = goto_state->copy(ValueStack::StateAfter, goto_state->bci()); goto_state = goto_state->copy(ValueStack::StateAfter, goto_state->bci());
goto_state->push(result->type(), result); goto_state->push(result->type(), result);
assert(goto_state->is_same(sux_state), "states must match now"); assert(goto_state->is_same(sux_state), "states must match now");