archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-17 01:24:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7103380: assertion failure with -XX:+PrintNativeNMethods

Browse source 
Reviewed-by: kvn, iveresov
This commit is contained in:
Tom Rodriguez 2011-10-23 12:31:20 -07:00
parent bf203dac41
commit 8b1bd284bc
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hotspot/src/share/vm/asm/codeBuffer.cpp
View file

@ -632,7 +632,8 @@ void CodeBuffer::copy_code_to(CodeBlob* dest_blob) {
// CodeBuffer gets the final layout (consts, insts, stubs in order of // CodeBuffer gets the final layout (consts, insts, stubs in order of
// ascending address). // ascending address).
void CodeBuffer::relocate_code_to(CodeBuffer* dest) const { void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
DEBUG_ONLY(address dest_end = dest->_total_start + dest->_total_size); address dest_end = dest->_total_start + dest->_total_size;
address dest_filled = NULL;
for (int n = (int) SECT_FIRST; n < (int) SECT_LIMIT; n++) { for (int n = (int) SECT_FIRST; n < (int) SECT_LIMIT; n++) {
// pull code out of each section // pull code out of each section
const CodeSection* cs = code_section(n); const CodeSection* cs = code_section(n);
@ -654,6 +655,8 @@ void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
Copy::fill_to_bytes(dest_cs->end(), dest_cs->remaining(), Copy::fill_to_bytes(dest_cs->end(), dest_cs->remaining(),
Assembler::code_fill_byte()); Assembler::code_fill_byte());
} }
// Keep track of the highest filled address
dest_filled = MAX2(dest_filled, dest_cs->end() + dest_cs->remaining());
assert(cs->locs_start() != (relocInfo*)badAddress, assert(cs->locs_start() != (relocInfo*)badAddress,
"this section carries no reloc storage, but reloc was attempted"); "this section carries no reloc storage, but reloc was attempted");
@ -668,6 +671,14 @@ void CodeBuffer::relocate_code_to(CodeBuffer* dest) const {
} }
} }
} }
if (dest->blob() == NULL) {
// Destination is a final resting place, not just another buffer.
// Normalize uninitialized bytes in the final padding.
Copy::fill_to_bytes(dest_filled, dest_end - dest_filled,
Assembler::code_fill_byte());
}
} }
csize_t CodeBuffer::figure_expanded_capacities(CodeSection* which_cs, csize_t CodeBuffer::figure_expanded_capacities(CodeSection* which_cs,