38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 7c73365615f00951272310db44dec2939b91b48e Mon Sep 17 00:00:00 2001
|
|
Date: Wed, 19 Feb 2020 19:09:39 +0000
|
|
Subject: [PATCH] fix incorrect offset for oop field with weak memory model
|
|
|
|
Summary: <interpreter>: add loadload membar in fast_storefield and fast_accessfield to avoid loading a incorrect offset
|
|
LLT: N/A
|
|
Bug url: N/A
|
|
---
|
|
hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp
|
|
index 5a619566..aa9545ee 100644
|
|
--- a/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp
|
|
+++ b/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp
|
|
@@ -2922,6 +2922,8 @@ void TemplateTable::fast_storefield(TosState state)
|
|
// access constant pool cache
|
|
__ get_cache_and_index_at_bcp(r2, r1, 1);
|
|
|
|
+ __ membar(MacroAssembler::LoadLoad);
|
|
+
|
|
// test for volatile with r3
|
|
__ ldrw(r3, Address(r2, in_bytes(base +
|
|
ConstantPoolCacheEntry::flags_offset())));
|
|
@@ -3013,6 +3015,9 @@ void TemplateTable::fast_accessfield(TosState state)
|
|
|
|
// access constant pool cache
|
|
__ get_cache_and_index_at_bcp(r2, r1, 1);
|
|
+
|
|
+ __ membar(MacroAssembler::LoadLoad);
|
|
+
|
|
__ ldr(r1, Address(r2, in_bytes(ConstantPoolCache::base_offset() +
|
|
ConstantPoolCacheEntry::f2_offset())));
|
|
__ ldrw(r3, Address(r2, in_bytes(ConstantPoolCache::base_offset() +
|
|
--
|
|
2.19.0
|
|
|