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

8298824: C2 crash: assert(is_Bool()) failed: invalid node class: ConI

Browse Source 
Reviewed-by: roland, kvn, thartmann
This commit is contained in:
Christian Hagedorn 2022-12-19 07:10:12 +00:00
parent ba942c24e8
commit 5e678f7500
2 changed files with 53 additions and 1 deletions
src/hotspot/share/opto
subnode.cpp
test/hotspot/jtreg/compiler/c2
TestCMoveIConAsBool.java

3
src/hotspot/share/opto/subnode.cpp

@ -1467,7 +1467,8 @@ Node *BoolNode::Ideal(PhaseGVN *phase, bool can_reshape) {
(_test._test == BoolTest::eq || _test._test == BoolTest::ne) &&
cmp1_op == Op_CMoveI && cmp2->find_int_con(1) == 0) {
// 0 should be on the true branch
if (cmp1->in(CMoveNode::IfTrue)->find_int_con(1) == 0 &&
if (cmp1->in(CMoveNode::Condition)->is_Bool() &&
cmp1->in(CMoveNode::IfTrue)->find_int_con(1) == 0 &&
cmp1->in(CMoveNode::IfFalse)->find_int_con(0) != 0) {
BoolNode* target = cmp1->in(CMoveNode::Condition)->as_Bool();
return new BoolNode(target->in(1),

51
test/hotspot/jtreg/compiler/c2/TestCMoveIConAsBool.java Normal file

@ -0,0 +1,51 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8298824
* @summary Test BoolNode::Ideal() transformation with CMoveINode that has a Con node as condition.
* @run main/othervm -Xcomp -XX:CompileCommand=compileonly,compiler.c2.TestCMoveIConAsBool::test
* compiler.c2.TestCMoveIConAsBool
*/
package compiler.c2;
public class TestCMoveIConAsBool {
static int x;
public static void main(String[] strArr) {
test();
}
static void test() {
int i = 7;
boolean b = false;
float f = 7.135f;
do {
b = i > f | b || x != 7;
}
while (++i < 0);
}
}