--- a/hotspot/src/share/vm/classfile/javaClasses.hpp	Fri Apr 17 08:09:41 2015 +0200
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp	Fri Apr 17 10:46:41 2015 +0200
@@ -1181,8 +1181,6 @@
   // Accessors
   static oop              target(         oop site);
   static void         set_target(         oop site, oop target);
-
-  static volatile oop     target_volatile(oop site);
   static void         set_target_volatile(oop site, oop target);
 
   // Testers

--- a/hotspot/src/share/vm/classfile/javaClasses.inline.hpp	Fri Apr 17 08:09:41 2015 +0200
+++ b/hotspot/src/share/vm/classfile/javaClasses.inline.hpp	Fri Apr 17 10:46:41 2015 +0200
@@ -29,10 +29,6 @@
 #include "oops/oop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 
-inline volatile oop java_lang_invoke_CallSite::target_volatile(oop site) {
-  return oop((oopDesc *)(site->obj_field_volatile(_target_offset)));
-}
-
 inline void java_lang_invoke_CallSite::set_target_volatile(oop site, oop target) {
   site->obj_field_put_volatile(_target_offset, target);
 }

--- a/hotspot/src/share/vm/oops/oop.hpp	Fri Apr 17 08:09:41 2015 +0200
+++ b/hotspot/src/share/vm/oops/oop.hpp	Fri Apr 17 10:46:41 2015 +0200
@@ -201,7 +201,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	Fri Apr 17 08:09:41 2015 +0200
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp	Fri Apr 17 10:46:41 2015 +0200
@@ -284,11 +284,6 @@
     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);