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

8261914: IfNode::fold_compares_helper faces non-canonicalized bool when running JRuby JSON workload

Browse Source 
Reviewed-by: kvn, shade
This commit is contained in:
Roland Westrelin 2021-03-01 08:47:59 +00:00
parent ddd550ae84
commit 20c93b3b90
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/share/opto/ifnode.cpp
View File

@ -884,8 +884,6 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
hi_type->_hi == max_jint && lo_type->_lo == min_jint && lo_test != BoolTest::ne) { hi_type->_hi == max_jint && lo_type->_lo == min_jint && lo_test != BoolTest::ne) {
assert((dom_bool->_test.is_less() && !proj->_con) || assert((dom_bool->_test.is_less() && !proj->_con) ||
(dom_bool->_test.is_greater() && proj->_con), "incorrect test"); (dom_bool->_test.is_greater() && proj->_con), "incorrect test");
// this test was canonicalized
assert(this_bool->_test.is_less() && fail->_con, "incorrect test");
// this_bool = < // this_bool = <
// dom_bool = >= (proj = True) or dom_bool = < (proj = False) // dom_bool = >= (proj = True) or dom_bool = < (proj = False)
@ -922,9 +920,11 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
return false; return false;
} }
} else { } else {
assert(false, "unhandled hi_test: %d", hi_test); assert(igvn->_worklist.member(in(1)) && in(1)->Value(igvn) != igvn->type(in(1)), "unhandled hi_test: %d", hi_test);
return false; return false;
} }
// this test was canonicalized
assert(this_bool->_test.is_less() && fail->_con, "incorrect test");
} else if (lo_type != NULL && hi_type != NULL && lo_type->_lo > hi_type->_hi && } else if (lo_type != NULL && hi_type != NULL && lo_type->_lo > hi_type->_hi &&
lo_type->_hi == max_jint && hi_type->_lo == min_jint && lo_test != BoolTest::ne) { lo_type->_hi == max_jint && hi_type->_lo == min_jint && lo_test != BoolTest::ne) {
@ -951,8 +951,6 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
assert((dom_bool->_test.is_less() && proj->_con) || assert((dom_bool->_test.is_less() && proj->_con) ||
(dom_bool->_test.is_greater() && !proj->_con), "incorrect test"); (dom_bool->_test.is_greater() && !proj->_con), "incorrect test");
// this test was canonicalized
assert(this_bool->_test.is_less() && !fail->_con, "incorrect test");
cond = (hi_test == BoolTest::le || hi_test == BoolTest::gt) ? BoolTest::gt : BoolTest::ge; cond = (hi_test == BoolTest::le || hi_test == BoolTest::gt) ? BoolTest::gt : BoolTest::ge;
@ -980,9 +978,11 @@ bool IfNode::fold_compares_helper(ProjNode* proj, ProjNode* success, ProjNode* f
return false; return false;
} }
} else { } else {
assert(false, "unhandled lo_test: %d", lo_test); assert(igvn->_worklist.member(in(1)) && in(1)->Value(igvn) != igvn->type(in(1)), "unhandled lo_test: %d", lo_test);
return false; return false;
} }
// this test was canonicalized
assert(this_bool->_test.is_less() && !fail->_con, "incorrect test");
} else { } else {
const TypeInt* failtype = filtered_int_type(igvn, n, proj); const TypeInt* failtype = filtered_int_type(igvn, n, proj);
if (failtype != NULL) { if (failtype != NULL) {