8131761: Fix merge error adding code that was removed in 8077936
Reviewed-by: tschatzl
--- a/hotspot/src/share/vm/oops/oop.hpp Wed Jul 22 07:47:34 2015 +0200
+++ b/hotspot/src/share/vm/oops/oop.hpp Wed Jul 22 16:25:06 2015 +0200
@@ -200,7 +200,6 @@
// Access to fields in a instanceOop through these methods.
oop obj_field(int offset) const;
- volatile oop obj_field_volatile(int offset) const;
void obj_field_put(int offset, oop value);
void obj_field_put_raw(int offset, oop value);
void obj_field_put_volatile(int offset, oop value);
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Wed Jul 22 07:47:34 2015 +0200
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp Wed Jul 22 16:25:06 2015 +0200
@@ -284,11 +284,7 @@
load_decode_heap_oop(obj_field_addr<narrowOop>(offset)) :
load_decode_heap_oop(obj_field_addr<oop>(offset));
}
-inline volatile oop oopDesc::obj_field_volatile(int offset) const {
- volatile oop value = obj_field(offset);
- OrderAccess::acquire();
- return value;
-}
+
inline void oopDesc::obj_field_put(int offset, oop value) {
UseCompressedOops ? oop_store(obj_field_addr<narrowOop>(offset), value) :
oop_store(obj_field_addr<oop>(offset), value);