OpenJDK / jdk-updates / jdk12u
changeset 51469:8a9e5819eab5
8209668: Explicit barriers for C1/assembler
Reviewed-by: roland, eosterlund
| author | rkennke |
|---|---|
| date | Tue, 21 Aug 2018 13:12:15 +0200 |
| parents | d48a852983eb |
| children | 84d3126858d5 |
| files | src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Tue Aug 21 11:41:54 2018 +0530 +++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp Tue Aug 21 13:12:15 2018 +0200 @@ -2167,6 +2167,9 @@ Register length = op->length()->as_register(); Register tmp = op->tmp()->as_register(); + __ resolve(ACCESS_READ, src); + __ resolve(ACCESS_WRITE, dst); + CodeStub* stub = op->stub(); int flags = op->flags(); BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL; @@ -2510,6 +2513,7 @@ scratch = op->scratch_opr()->as_register(); } assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header"); + __ resolve(ACCESS_READ | ACCESS_WRITE, obj); // add debug info for NullPointerException only if one is possible int null_check_offset = __ lock_object(hdr, obj, lock, scratch, *op->stub()->entry()); if (op->info() != NULL) {
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Tue Aug 21 11:41:54 2018 +0530 +++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp Tue Aug 21 13:12:15 2018 +0200 @@ -3038,6 +3038,9 @@ Register length = op->length()->as_register(); Register tmp = op->tmp()->as_register(); + __ resolve(ACCESS_READ, src); + __ resolve(ACCESS_WRITE, dst); + CodeStub* stub = op->stub(); int flags = op->flags(); BasicType basic_type = default_type != NULL ? default_type->element_type()->basic_type() : T_ILLEGAL; @@ -3476,6 +3479,7 @@ scratch = op->scratch_opr()->as_register(); } assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header"); + __ resolve(ACCESS_READ | ACCESS_WRITE, obj); // add debug info for NullPointerException only if one is possible int null_check_offset = __ lock_object(hdr, obj, lock, scratch, *op->stub()->entry()); if (op->info() != NULL) {