mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 12:09:14 +00:00
8336906: C2: assert(bb->is_reachable()) failed: getting result from unreachable basicblock
Co-authored-by: Emanuel Peter <epeter@openjdk.org> Co-authored-by: Dean Long <dlong@openjdk.org> Reviewed-by: epeter, dlong
This commit is contained in:
parent
a989245a24
commit
97b0dd2167
@ -842,13 +842,24 @@ void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_arr
|
||||
}
|
||||
|
||||
#ifndef PRODUCT
|
||||
// Return true if the execution after the provided bytecode continues at the
|
||||
// next bytecode in the code. This is not the case for gotos, returns, and
|
||||
// throws.
|
||||
static bool falls_through(Bytecodes::Code bc) {
|
||||
switch (bc) {
|
||||
// List may be incomplete. Here we really only care about bytecodes where compiled code
|
||||
// can deoptimize.
|
||||
case Bytecodes::_goto:
|
||||
case Bytecodes::_goto_w:
|
||||
case Bytecodes::_athrow:
|
||||
case Bytecodes::_areturn:
|
||||
case Bytecodes::_dreturn:
|
||||
case Bytecodes::_freturn:
|
||||
case Bytecodes::_ireturn:
|
||||
case Bytecodes::_lreturn:
|
||||
case Bytecodes::_jsr:
|
||||
case Bytecodes::_ret:
|
||||
case Bytecodes::_return:
|
||||
case Bytecodes::_lookupswitch:
|
||||
case Bytecodes::_tableswitch:
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
|
||||
@ -0,0 +1,117 @@
|
||||
/*
|
||||
* Copyright (c) 2025, 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 id=return
|
||||
* @bug 8336906
|
||||
* @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after return.
|
||||
* @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
|
||||
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
|
||||
* -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
|
||||
* compiler.interpreter.TestVerifyStackWithUnreachableBytecode return
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test id=areturn
|
||||
* @bug 8336906
|
||||
* @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after areturn.
|
||||
* @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
|
||||
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
|
||||
* -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
|
||||
* compiler.interpreter.TestVerifyStackWithUnreachableBytecode areturn
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test id=goto
|
||||
* @bug 8336906 8271055
|
||||
* @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after goto.
|
||||
* @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
|
||||
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
|
||||
* -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
|
||||
* compiler.interpreter.TestVerifyStackWithUnreachableBytecode goto
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test id=gotow
|
||||
* @bug 8336906 8271055
|
||||
* @summary Ensure VerifyStack does not crash on bytecodes in unreachable basic blocks after gotow.
|
||||
* @compile TestVerifyStackWithUnreachableBytecodeImpl.jasm TestVerifyStackWithUnreachableBytecode.java
|
||||
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+VerifyStack -Xcomp
|
||||
* -XX:CompileCommand=compileonly,compiler/interpreter/TestVerifyStackWithUnreachableBytecodeImpl.test*
|
||||
* compiler.interpreter.TestVerifyStackWithUnreachableBytecode gotow
|
||||
*/
|
||||
|
||||
package compiler.interpreter;
|
||||
|
||||
import compiler.interpreter.TestVerifyStackWithUnreachableBytecodeImpl;
|
||||
|
||||
public class TestVerifyStackWithUnreachableBytecode {
|
||||
public static void main(String[] args) {
|
||||
TestCase t = testCaseFromString(args[0]);
|
||||
|
||||
// The following is designed to cause a deopt with the reason `null_assert_or_unreached0`
|
||||
// when accessing A.val using getstatic due to the class B not being loaded and the consequent
|
||||
// assumption of A.val == null.
|
||||
TestVerifyStackWithUnreachableBytecodeA.val = null;
|
||||
dispatchTest(t);
|
||||
TestVerifyStackWithUnreachableBytecodeA.val = new TestVerifyStackWithUnreachableBytecodeB(42);
|
||||
dispatchTest(t);
|
||||
}
|
||||
|
||||
private enum TestCase {
|
||||
ARETURN,
|
||||
GOTO,
|
||||
GOTOW,
|
||||
RETURN;
|
||||
}
|
||||
|
||||
private static TestCase testCaseFromString(String s) {
|
||||
return switch (s) {
|
||||
case "areturn" -> TestCase.ARETURN;
|
||||
case "return" -> TestCase.RETURN;
|
||||
case "goto" -> TestCase.GOTO;
|
||||
case "gotow" -> TestCase.GOTOW;
|
||||
default -> throw new RuntimeException("Test argument not recognized: " + s);
|
||||
};
|
||||
}
|
||||
|
||||
private static void dispatchTest(TestCase testCase) {
|
||||
switch (testCase) {
|
||||
case ARETURN -> TestVerifyStackWithUnreachableBytecodeImpl.testAreturn();
|
||||
case RETURN -> TestVerifyStackWithUnreachableBytecodeImpl.testReturn();
|
||||
case GOTO -> TestVerifyStackWithUnreachableBytecodeImpl.testGoto();
|
||||
case GOTOW -> TestVerifyStackWithUnreachableBytecodeImpl.testGotow();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class TestVerifyStackWithUnreachableBytecodeA {
|
||||
public static TestVerifyStackWithUnreachableBytecodeB val = null;
|
||||
}
|
||||
|
||||
class TestVerifyStackWithUnreachableBytecodeB {
|
||||
public int val = 0;
|
||||
|
||||
TestVerifyStackWithUnreachableBytecodeB(int v) { this.val = v; }
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
/*
|
||||
* Copyright (c) 2025, 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.
|
||||
*
|
||||
*/
|
||||
|
||||
package compiler/interpreter;
|
||||
|
||||
// We need a class file format version < 50:0 so we do not need to specify a
|
||||
// stack map for the unreachable bytecodes, which are the reason this test
|
||||
// relies on a JASM implementation.
|
||||
super class TestVerifyStackWithUnreachableBytecodeImpl version 49:0
|
||||
{
|
||||
public Method "<init>":"()V"
|
||||
stack 1 locals 1
|
||||
{
|
||||
aload_0;
|
||||
invokespecial Method java/lang/Object."<init>":"()V";
|
||||
return;
|
||||
}
|
||||
public static Method testAreturn:"()Ljava/lang/Object;"
|
||||
stack 1 locals 0
|
||||
{
|
||||
// If A not loaded -> trap for TestVerifyStackWithUnreachableBytecodeA unloaded
|
||||
// If a loaded, but TestVerifyStackWithUnreachableBytecodeB not -> assume TestVerifyStackWithUnreachableBytecodeA.val null, else trap.
|
||||
// -> "null_assert_or_unreached0"
|
||||
getstatic Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
|
||||
areturn;
|
||||
|
||||
// some unreachable instruction after return
|
||||
iconst_0;
|
||||
}
|
||||
public static Method testReturn:"()V"
|
||||
stack 1 locals 0
|
||||
{
|
||||
getstatic Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
|
||||
return;
|
||||
// unreachable
|
||||
iconst_0;
|
||||
}
|
||||
public static Method testGoto:"()V"
|
||||
stack 1 locals 0
|
||||
{
|
||||
getstatic Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
|
||||
goto There;
|
||||
// unreachable
|
||||
iconst_0;
|
||||
There:
|
||||
return;
|
||||
}
|
||||
public static Method testGotow:"()V"
|
||||
stack 1 locals 0
|
||||
{
|
||||
getstatic Field compiler/interpreter/TestVerifyStackWithUnreachableBytecodeA.val:"Lcompiler/interpreter/TestVerifyStackWithUnreachableBytecodeB;";
|
||||
goto_w There;
|
||||
// unreachable
|
||||
iconst_0;
|
||||
There:
|
||||
return;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user