src/hotspot/cpu/x86/macroAssembler_x86.hpp

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

@@ -317,17 +317,13 @@
   void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
                       Register tmp1, Register thread_tmp);
   void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src,
                        Register tmp1, Register tmp2);
 
-  // Resolves obj for read access. Result is placed in the same register.
+  // Resolves obj access. Result is placed in the same register.
   // All other registers are preserved.
-  void resolve_for_read(DecoratorSet decorators, Register obj);
-
-  // Resolves obj for write access. Result is placed in the same register.
-  // All other registers are preserved.
-  void resolve_for_write(DecoratorSet decorators, Register obj);
+  void resolve(DecoratorSet decorators, Register obj);
 
   void load_heap_oop(Register dst, Address src, Register tmp1 = noreg,
                      Register thread_tmp = noreg, DecoratorSet decorators = 0);
   void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
                               Register thread_tmp = noreg, DecoratorSet decorators = 0);