archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8139906: assert(src->section_index_of(target) == CodeBuffer::SECT_NONE) failed: sanity

Browse source 
The card table address used in the g1_post_barrier_slow stub should not be marked as relocatable.

Reviewed-by: kvn
This commit is contained in:
Tobias Hartmann 2017-02-24 11:52:04 +01:00
parent 5b097b494d
commit c7de967bcb
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hotspot/src/cpu/arm/vm/c1_Runtime1_arm.cpp
View file

@ -618,7 +618,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
Address buffer(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() + Address buffer(Rthread, in_bytes(JavaThread::dirty_card_queue_offset() +
DirtyCardQueue::byte_offset_of_buf())); DirtyCardQueue::byte_offset_of_buf()));
AddressLiteral cardtable((address)ct->byte_map_base); AddressLiteral cardtable((address)ct->byte_map_base, relocInfo::none);
assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code"); assert(sizeof(*ct->byte_map_base) == sizeof(jbyte), "adjust this code");
// save at least the registers that need saving if the runtime is called // save at least the registers that need saving if the runtime is called
@ -645,7 +645,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
// Note: there is a comment in x86 code about not using // Note: there is a comment in x86 code about not using
// ExternalAddress / lea, due to relocation not working // ExternalAddress / lea, due to relocation not working
// properly for that address. Should be OK for arm, where we // properly for that address. Should be OK for arm, where we
// explicitly specify that 'cartable' has a relocInfo::none // explicitly specify that 'cardtable' has a relocInfo::none
// type. // type.
__ lea(r_card_base_1, cardtable); __ lea(r_card_base_1, cardtable);
__ add(r_card_addr_0, r_card_base_1, AsmOperand(r_obj_0, lsr, CardTableModRefBS::card_shift)); __ add(r_card_addr_0, r_card_base_1, AsmOperand(r_obj_0, lsr, CardTableModRefBS::card_shift));