OpenJDK / jdk / jdk12
changeset 16997:d5dfdf746abd
8012335: G1: Fix bug with compressed oops in template interpreter on x86 and sparc.
Summary: In do_oop_store the uncompressed value of the oop being stored needs to be preserved and passed to g1_write_barrier_post. This is necessary for the heap region cross check to work correctly.
Reviewed-by: coleenp, johnc
Contributed-by: Martin Doerr <martin.doerr@sap.com>
| author | johnc |
|---|---|
| date | Wed, 17 Apr 2013 10:57:02 -0700 |
| parents | e699388c6dd8 |
| children | d61c4c63f619 |
| files | hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Mon Apr 01 10:50:30 2013 -0700 +++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Wed Apr 17 10:57:02 2013 -0700 @@ -63,6 +63,13 @@ noreg /* pre_val */, tmp, true /*preserve_o_regs*/); + // G1 barrier needs uncompressed oop for region cross check. + Register new_val = val; + if (UseCompressedOops && val != G0) { + new_val = tmp; + __ mov(val, new_val); + } + if (index == noreg ) { assert(Assembler::is_simm13(offset), "fix this code"); __ store_heap_oop(val, base, offset); @@ -79,7 +86,7 @@ __ add(base, index, base); } } - __ g1_write_barrier_post(base, val, tmp); + __ g1_write_barrier_post(base, new_val, tmp); } } break;
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Mon Apr 01 10:50:30 2013 -0700 +++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp Wed Apr 17 10:57:02 2013 -0700 @@ -158,14 +158,19 @@ if (val == noreg) { __ store_heap_oop_null(Address(rdx, 0)); } else { + // G1 barrier needs uncompressed oop for region cross check. + Register new_val = val; + if (UseCompressedOops) { + new_val = rbx; + __ movptr(new_val, val); + } __ store_heap_oop(Address(rdx, 0), val); __ g1_write_barrier_post(rdx /* store_adr */, - val /* new_val */, + new_val /* new_val */, r15_thread /* thread */, r8 /* tmp */, rbx /* tmp2 */); } - } break; #endif // INCLUDE_ALL_GCS