Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
8291459: JVM crash with GenerateOopMap::error_work(char const*, __va_…
…list_tag*) Backport-of: 8d88be233bc0d27d78e51c4eff0ba1ee47f4617a
- Loading branch information
Showing
3 changed files
with
115 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
test/hotspot/jtreg/runtime/GenerateOopMap/TestGenerateOopMapCrash.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* 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 8291459 | ||
* @summary Test that GenerateOopMap does not crash if last bytecode is a conditional branch | ||
* @library /test/lib / | ||
* @requires vm.flagless | ||
* @compile if_icmpleIsLastOpcode.jasm | ||
* @run driver TestGenerateOopMapCrash | ||
*/ | ||
|
||
import jdk.test.lib.process.OutputAnalyzer; | ||
import jdk.test.lib.process.ProcessTools; | ||
|
||
// This test was copied from compiler test TestLinkageErrorInGenerateOopMap.java. | ||
public class TestGenerateOopMapCrash { | ||
|
||
public static void main(String args[]) throws Exception { | ||
if (args.length == 0) { | ||
// Spawn new VM instance to execute test | ||
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( | ||
"-XX:-TieredCompilation", | ||
"-XX:CompileCommand=dontinline,if_icmpleIsLastOpcode.m*", | ||
"-Xmx64m", | ||
TestGenerateOopMapCrash.class.getName(), | ||
"run"); | ||
OutputAnalyzer output = new OutputAnalyzer(pb.start()); | ||
output.shouldHaveExitValue(0); | ||
} else { | ||
// Execute test | ||
if_icmpleIsLastOpcode.test(); | ||
} | ||
} | ||
} |
52 changes: 52 additions & 0 deletions
52
test/hotspot/jtreg/runtime/GenerateOopMap/if_icmpleIsLastOpcode.jasm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* 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. | ||
* | ||
*/ | ||
|
||
// Old class file with a method whose last bytecode is an unreachable | ||
// conditional branch. | ||
public class if_icmpleIsLastOpcode version 49:0 { | ||
public static Method m1:"()I" stack 1 locals 0 { | ||
iconst_0; | ||
ireturn; | ||
} | ||
|
||
public static Method m2:"(I)V" stack 1 locals 1 { | ||
return; | ||
} | ||
|
||
public static Method test:"()V" stack 2 locals 1 { | ||
iconst_0; | ||
istore_0; | ||
Loop: stack_frame_type append; | ||
locals_map int; | ||
iload_0; | ||
invokestatic Method if_icmpleIsLastOpcode."m1":"()I"; | ||
invokestatic Method if_icmpleIsLastOpcode."m2":"(I)V"; | ||
iinc 0, 1; | ||
ldc 100000; | ||
if_icmple Loop; | ||
return; | ||
ldc 100000; | ||
if_icmple Loop; | ||
} | ||
} |
ed3b13a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues