Skip to content

Commit

Permalink
8313626: C2 crash due to unexpected exception control flow
Browse files Browse the repository at this point in the history
Backport-of: f8203cb272e6136b784e5c43a500f6a0bfb19c8b
  • Loading branch information
TobiHartmann committed Sep 1, 2023
1 parent 33ce611 commit 233076e
Show file tree
Hide file tree
Showing 3 changed files with 180 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/hotspot/share/opto/doCall.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,8 @@ void Parse::catch_inline_exceptions(SafePointNode* ex_map) {
if (PrintOpto && WizardMode) {
tty->print_cr(" Catching every inline exception bci:%d -> handler_bci:%d", bci(), handler_bci);
}
// If this is a backwards branch in the bytecodes, add safepoint
maybe_add_safepoint(handler_bci);
merge_exception(handler_bci); // jump to handler
return; // No more handling to be done here!
}
Expand Down Expand Up @@ -1014,6 +1016,8 @@ void Parse::catch_inline_exceptions(SafePointNode* ex_map) {
klass->print_name();
tty->cr();
}
// If this is a backwards branch in the bytecodes, add safepoint
maybe_add_safepoint(handler_bci);
merge_exception(handler_bci);
}
set_control(not_subtype_ctrl);
Expand Down
111 changes: 111 additions & 0 deletions test/hotspot/jtreg/compiler/parsing/MissingSafepointOnTryCatch.jasm
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
/*
* Copyright (c) 2023, 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.
*/

public class MissingSafepointOnTryCatch version 52:0 {

static Method m:"()V" {
return;
}

static Method test1:"()V" stack 1 {
try t;
invokestatic m:"()V";
return;

catch t java/lang/Throwable;
stack_map class java/lang/Throwable;
athrow;
endtry t;
}

static Method test2:"()V" stack 1 {
try t0;
try t1;
invokestatic m:"()V";
endtry t1;
return;

catch t1 java/lang/Exception;
stack_map class java/lang/Exception;
return;

catch t0 java/lang/Throwable;
stack_map class java/lang/Throwable;
athrow;
endtry t0;
}

public static Method th:"()V"
throws java/lang/Exception
stack 2 locals 0
{
new class java/lang/Exception;
dup;
invokespecial Method java/lang/Exception."<init>":"()V";
athrow;
}

static Method test3:"()V" stack 1 locals 2 {
try t;
invokestatic m:"()V";
iconst_1;
istore_0;
iconst_0;
istore_1;
return;
catch t java/lang/Throwable;
stack_map class java/lang/Throwable;
invokestatic th:"()V";
return;
endtry t;
}

static Method test4:"()V" stack 2 locals 2 {
try t;
invokestatic m:"()V";
iconst_1;
istore_0;
iconst_0;
istore_1;
return;
catch t java/lang/Throwable;
stack_map class java/lang/Throwable;
iconst_1;
istore_0;
invokestatic th:"()V";
return;
endtry t;
}

static Method testInfinite:"()V" stack 1 {
try t;
invokestatic th:"()V";
return;

catch t java/lang/Throwable;
stack_map class java/lang/Throwable;
athrow;
endtry t;
}

} // end Class MissingSafepointOnTryCatch
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* Copyright (c) 2023, 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 8313626
* @summary assert(false) failed: malformed control flow to missing safepoint on backedge of a try-catch
* @library /test/lib
* @compile MissingSafepointOnTryCatch.jasm
* @run main/othervm -XX:CompileCommand=quiet
* -XX:CompileCommand=compileonly,MissingSafepointOnTryCatch::test*
* -XX:CompileCommand=dontinline,MissingSafepointOnTryCatch::m
* -XX:CompileCommand=inline,MissingSafepointOnTryCatch::th
* -XX:-TieredCompilation -Xcomp TestMissingSafepointOnTryCatch
*/

import jdk.test.lib.Utils;

public class TestMissingSafepointOnTryCatch {

public static void infiniteLoop() {
try {
Thread thread = new Thread() {
public void run() {
MissingSafepointOnTryCatch.testInfinite();
}
};
thread.setDaemon(true);
thread.start();
Thread.sleep(Utils.adjustTimeout(500));
} catch (Exception e) {}
}

public static void main(String[] args) {
try {
// to make sure java/lang/Exception class is resolved
MissingSafepointOnTryCatch.th();
} catch (Exception e) {}
MissingSafepointOnTryCatch.test1();
MissingSafepointOnTryCatch.test2();
MissingSafepointOnTryCatch.test3();
MissingSafepointOnTryCatch.test4();
infiniteLoop();
}
}

1 comment on commit 233076e

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.