Revert "Merge with IceTea 3.13 HotSpot"

This reverts commit 1ace1b4.
corretto · Jul 12, 2019 · 4ae3954 · 4ae3954
1 parent 72e3f3f
commit 4ae3954
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/src/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
@@ -3268,10 +3268,10 @@ void LIR_Assembler::atomic_op(LIR_Code code, LIR_Opr src, LIR_Opr data, LIR_Opr
       Register obj = as_reg(data);
       Register dst = as_reg(dest);
       if (is_oop && UseCompressedOops) {
-        __ encode_heap_oop(rscratch2, obj);
-        obj = rscratch2;
+        __ encode_heap_oop(rscratch1, obj);
+        obj = rscratch1;
       }
-      assert_different_registers(obj, addr.base(), tmp, rscratch1, dst);
+      assert_different_registers(obj, addr.base(), tmp, rscratch2, dst);
       __ lea(tmp, addr);
       if (UseLSE) {
         __ swp(sz, obj, dst, tmp);

diff --git a/src/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/src/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
@@ -787,10 +787,10 @@ class MacroAssembler: public Assembler {
   void store_check_part_1(Register obj);
   void store_check_part_2(Register obj);
 
+  // oop manipulations
   // C 'boolean' to Java boolean: x == 0 ? 0 : 1
   void c2bool(Register x);
 
-  // oop manipulations
   void load_klass(Register dst, Register src);
   void store_klass(Register dst, Register src);
   void cmp_klass(Register oop, Register trial_klass, Register tmp);

diff --git a/src/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp b/src/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp
@@ -2796,7 +2796,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
   {
     Label notVolatile;
     __ tbz(r5, ConstantPoolCacheEntry::is_volatile_shift, notVolatile);
-    __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
+    __ membar(MacroAssembler::StoreLoad);
     __ bind(notVolatile);
   }
 }
@@ -2934,7 +2934,7 @@ void TemplateTable::fast_storefield(TosState state)
   {
     Label notVolatile;
     __ tbz(r3, ConstantPoolCacheEntry::is_volatile_shift, notVolatile);
-    __ membar(MacroAssembler::StoreLoad | MacroAssembler::StoreStore);
+    __ membar(MacroAssembler::StoreLoad);
     __ bind(notVolatile);
   }
 }

diff --git a/src/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp b/src/hotspot/src/share/vm/gc_implementation/g1/g1CodeCacheRemSet.cpp
@@ -205,9 +205,7 @@ CodeRootSetTable* G1CodeRootSet::load_acquire_table() {
 }
 
 void G1CodeRootSet::allocate_small_table() {
-  CodeRootSetTable* temp = new CodeRootSetTable(SmallSize);
-
-  OrderAccess::release_store_ptr(&_table, temp);
+  _table = new CodeRootSetTable(SmallSize);
 }
 
 void CodeRootSetTable::purge_list_append(CodeRootSetTable* table) {