src/share/vm/oops/oop.inline.hpp

*** 200,211 ****
  inline oop oopDesc::decode_heap_oop_not_null(oop v) { return v; }
  inline oop oopDesc::decode_heap_oop(oop v)  { return v; }
  
  // Load an oop out of the Java heap as is without decoding.
  // Called by GC to check for null before decoding.
! inline oop       oopDesc::load_heap_oop(oop* p)          { return *p; }
! inline narrowOop oopDesc::load_heap_oop(narrowOop* p)    { return *p; }
  
  // Load and decode an oop out of the Java heap into a wide oop.
  inline oop oopDesc::load_decode_heap_oop_not_null(oop* p)       { return *p; }
  inline oop oopDesc::load_decode_heap_oop_not_null(narrowOop* p) {
    return decode_heap_oop_not_null(*p);
--- 200,211 ----
  inline oop oopDesc::decode_heap_oop_not_null(oop v) { return v; }
  inline oop oopDesc::decode_heap_oop(oop v)  { return v; }
  
  // Load an oop out of the Java heap as is without decoding.
  // Called by GC to check for null before decoding.
! inline oop       oopDesc::load_heap_oop(oop* p)          { return * (volatile oop*) p; }
! inline narrowOop oopDesc::load_heap_oop(narrowOop* p)    { return * (volatile narrowOop*) p; }
  
  // Load and decode an oop out of the Java heap into a wide oop.
  inline oop oopDesc::load_decode_heap_oop_not_null(oop* p)       { return *p; }
  inline oop oopDesc::load_decode_heap_oop_not_null(narrowOop* p) {
    return decode_heap_oop_not_null(*p);