infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-28 16:50:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

8380686: GenerateOopMap logging crashes in rewriter

Browse Source 
Reviewed-by: matsaave, phubner
This commit is contained in:
Coleen Phillimore 2026-03-27 19:55:32 +00:00
parent 7ffc4a4fb4
commit 7e4ac140d9
3 changed files with 99 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hotspot/share/interpreter/bytecodeTracer.cpp
View File

@ -52,9 +52,9 @@ class BytecodePrinter {
Bytecodes::Code _code;
address _next_pc; // current decoding position
int _flags;
bool _is_linked;
bool _use_cp_cache;
bool is_linked() const { return _is_linked; }
bool use_cp_cache() const { return _use_cp_cache; }
void align() { _next_pc = align_up(_next_pc, sizeof(jint)); }
int get_byte() { return *(jbyte*) _next_pc++; } // signed
int get_index_u1() { return *(address)_next_pc++; } // returns 0x00 - 0xff as an int
@ -69,7 +69,7 @@ class BytecodePrinter {
bool is_wide() const { return _is_wide; }
Bytecodes::Code raw_code() const { return Bytecodes::Code(_code); }
ConstantPool* constants() const { return method()->constants(); }
ConstantPoolCache* cpcache() const { assert(is_linked(), "must be"); return constants()->cache(); }
ConstantPoolCache* cpcache() const { assert(use_cp_cache(), "must be"); return constants()->cache(); }
void print_constant(int i, outputStream* st);
void print_cpcache_entry(int cpc_index, outputStream* st);
@ -94,8 +94,9 @@ class BytecodePrinter {
ResourceMark rm;
bool method_changed = _current_method != method();
_current_method = method();
_is_linked = method->method_holder()->is_linked();
assert(_is_linked, "this function must be called on methods that are already executing");
_use_cp_cache = method->constants()->cache() != nullptr;
assert(method->method_holder()->is_linked(),
"this function must be called on methods that are already executing");
if (method_changed) {
// Note 1: This code will not work as expected with true MT/MP.
@ -150,7 +151,8 @@ class BytecodePrinter {
// BytecodeStream, which will skip wide bytecodes.
void trace(const methodHandle& method, address bcp, outputStream* st) {
_current_method = method();
_is_linked = method->method_holder()->is_linked();
// This may be called during linking after bytecodes are rewritten to point to the cpCache.
_use_cp_cache = method->constants()->cache() != nullptr;
ResourceMark rm;
Bytecodes::Code code = Bytecodes::code_at(method(), bcp);
// Set is_wide
@ -301,7 +303,7 @@ void BytecodePrinter::print_invokedynamic(int indy_index, int cp_index, outputSt
if (ClassPrinter::has_mode(_flags, ClassPrinter::PRINT_DYNAMIC)) {
print_bsm(cp_index, st);
if (is_linked()) {
if (use_cp_cache()) {
ResolvedIndyEntry* indy_entry = constants()->resolved_indy_entry_at(indy_index);
st->print(" ResolvedIndyEntry: ");
indy_entry->print_on(st);
@ -365,7 +367,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
{
int cp_index;
if (Bytecodes::uses_cp_cache(raw_code())) {
assert(is_linked(), "fast ldc bytecode must be in linked classes");
assert(use_cp_cache(), "fast ldc bytecode must be in linked classes");
int obj_index = get_index_u1();
cp_index = constants()->object_to_cp_index(obj_index);
} else {
@ -380,7 +382,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
{
int cp_index;
if (Bytecodes::uses_cp_cache(raw_code())) {
assert(is_linked(), "fast ldc bytecode must be in linked classes");
assert(use_cp_cache(), "fast ldc bytecode must be in linked classes");
int obj_index = get_native_index_u2();
cp_index = constants()->object_to_cp_index(obj_index);
} else {
@ -510,7 +512,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
case Bytecodes::_getfield:
{
int cp_index;
if (is_linked()) {
if (use_cp_cache()) {
int field_index = get_native_index_u2();
cp_index = cpcache()->resolved_field_entry_at(field_index)->constant_pool_index();
} else {
@ -525,7 +527,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
case Bytecodes::_invokestatic:
{
int cp_index;
if (is_linked()) {
if (use_cp_cache()) {
int method_index = get_native_index_u2();
ResolvedMethodEntry* method_entry = cpcache()->resolved_method_entry_at(method_index);
cp_index = method_entry->constant_pool_index();
@ -533,7 +535,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
if (raw_code() == Bytecodes::_invokehandle &&
ClassPrinter::has_mode(_flags, ClassPrinter::PRINT_METHOD_HANDLE)) {
assert(is_linked(), "invokehandle is only in rewritten methods");
assert(use_cp_cache(), "invokehandle is only in rewritten methods");
method_entry->print_on(st);
if (method_entry->has_appendix()) {
st->print(" appendix: ");
@ -550,7 +552,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
case Bytecodes::_invokeinterface:
{
int cp_index;
if (is_linked()) {
if (use_cp_cache()) {
int method_index = get_native_index_u2();
cp_index = cpcache()->resolved_method_entry_at(method_index)->constant_pool_index();
} else {
@ -566,7 +568,7 @@ void BytecodePrinter::print_attributes(int bci, outputStream* st) {
{
int indy_index;
int cp_index;
if (is_linked()) {
if (use_cp_cache()) {
indy_index = get_native_index_u4();
cp_index = constants()->resolved_indy_entry_at(indy_index)->constant_pool_index();
} else {

43
test/hotspot/jtreg/runtime/interpreter/JsrLogging.jasm Normal file
View File

@ -0,0 +1,43 @@
/*
* Copyright (c) 2026, 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 super class JsrLogging version 49:0
{
static Field i:I;
public static Method test:"()V"
stack 3 locals 1
{
nop;
jsr LABEL;
bipush 66;
LABEL:
bipush 55;
putstatic Field i:"I";
getstatic Field java/lang/System.out:"Ljava/io/PrintStream;";
ldc String "hello";
invokevirtual Method java/io/PrintStream.println:"(Ljava/lang/String;)V";
return;
}
}

40
test/hotspot/jtreg/runtime/interpreter/JsrLoggingTest.java Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2026, 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 8380686
* @summary Ensure logging works while processing jsr while linking.
* @library /test/lib
* @compile JsrLogging.jasm
* @run main/othervm -Xlog:generateoopmap=debug JsrLoggingTest
*/
public class JsrLoggingTest {
public static void main(String[] args) {
for (int i = 0; i < 10; ++i) {
JsrLogging.test();
}
System.out.println("PASSED");
}
}