Skip to content

8307331: Correctly update line maps when class redefine rewrites bytecodes #1324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8307331: Correctly update line maps when class redefine rewrites bytecodes #1324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/hotspot/share/runtime/relocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,24 @@ void Relocator::adjust_exception_table(int bci, int delta) {
}
}

static void print_linenumber_table(unsigned char* table) {
CompressedLineNumberReadStream stream(table);
tty->print_cr("-------------------------------------------------");
while (stream.read_pair()) {
tty->print_cr(" - line %d: %d", stream.line(), stream.bci());
}
tty->print_cr("-------------------------------------------------");
}

// The width of instruction at "bci" is changing by "delta". Adjust the line number table.
void Relocator::adjust_line_no_table(int bci, int delta) {
if (method()->has_linenumber_table()) {
CompressedLineNumberReadStream reader(method()->compressed_linenumber_table());
// if we already made adjustments then use the updated table
unsigned char *table = compressed_line_number_table();
if (table == nullptr) {
table = method()->compressed_linenumber_table();
}
CompressedLineNumberReadStream reader(table);
CompressedLineNumberWriteStream writer(64); // plenty big for most line number tables
while (reader.read_pair()) {
int adjustment = (reader.bci() > bci) ? delta : 0;
Expand All @@ -426,6 +439,10 @@ void Relocator::adjust_line_no_table(int bci, int delta) {
writer.write_terminator();
set_compressed_line_number_table(writer.buffer());
set_compressed_line_number_table_size(writer.position());
if (TraceRelocator) {
tty->print_cr("Adjusted line number table");
print_linenumber_table(compressed_line_number_table());
}
}
}

Expand Down