src/hotspot/cpu/x86/macroAssembler_x86.cpp

rev 50904 : 8205523: Explicit barriers for interpreter
rev 50905 : [mq]: JDK-8205523-01-x86.patch

@@ -6285,18 +6285,17 @@
   } else {
     bs->store_at(this, decorators, type, dst, src, tmp1, tmp2);
   }
 }
 
-void MacroAssembler::resolve_for_read(DecoratorSet decorators, Register obj) {
-  BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  return bs->resolve_for_read(this, decorators, obj);
-}
-
-void MacroAssembler::resolve_for_write(DecoratorSet decorators, Register obj) {
+void MacroAssembler::resolve(DecoratorSet decorators, Register obj) {
+  // Use stronger ACCESS_WRITE by default.
+  if ((decorators & ACCESS_READ) == 0) {
+    decorators |= ACCESS_WRITE;
+  }
   BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-  return bs->resolve_for_write(this, decorators, obj);
+  return bs->resolve(this, decorators, obj);
 }
 
 void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,
                                    Register thread_tmp, DecoratorSet decorators) {
   access_load_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, thread_tmp);