commit 94679309a4601e505d42570610888280326f1ecc
author Aleksei Voitylov <avoitylov@openjdk.org> Mon Sep 24 16:54:42 2018 +0300
committer Aleksei Voitylov <avoitylov@openjdk.org> Mon Sep 24 16:54:42 2018 +0300
tree f7a059e0058a54ebb800333f58457cb27fc382a4
parent 6c596e1c313001a93337c2c412bb839c7e84d281

8209697: ARM: Explicit barriers for C1/assembler

Reviewed-by: dsamersoff

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

diff --git a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
index cc11d3e..873721c 100644
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
@@ -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());