--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp Mon Sep 24 16:52:12 2018 +0300
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp Mon Sep 24 16:54:42 2018 +0300
@@ -2764,6 +2764,9 @@
assert(length == R4, "code assumption");
#endif // AARCH64
+ __ resolve(ACCESS_READ, src);
+ __ resolve(ACCESS_WRITE, dst);
+
CodeStub* stub = op->stub();
int flags = op->flags();
@@ -3129,6 +3132,7 @@
__ b(*op->stub()->entry());
} else if (op->code() == lir_lock) {
assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
+ __ resolve(ACCESS_READ | ACCESS_WRITE, obj);
int null_check_offset = __ lock_object(hdr, obj, lock, tmp, *op->stub()->entry());
if (op->info() != NULL) {
add_debug_info_for_null_check(null_check_offset, op->info());