From a9308705ff8a35cb2cb8c7cace62840437d91503 Mon Sep 17 00:00:00 2001
From: Thomas Schatzl <tschatzl@openjdk.org>
Date: Wed, 17 Feb 2021 08:50:06 +0000
Subject: [PATCH] 8261309: Remove remaining StoreLoad barrier with
 UseCondCardMark for Serial/Parallel GC

Reviewed-by: shade, ayang, sjohanss
---
 .../aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
index a86e0dc5171..fb677828e20 100644
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp
@@ -46,7 +46,6 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
 
   if (UseCondCardMark) {
     Label L_already_dirty;
-    __ membar(Assembler::StoreLoad);
     __ ldrb(rscratch2,  Address(obj, rscratch1));
     __ cbz(rscratch2, L_already_dirty);
     __ strb(zr, Address(obj, rscratch1));