src/hotspot/cpu/ppc/nativeInst_ppc.cpp

*** 25,35 ****
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "nativeInst_ppc.hpp"
! #include "oops/oop.inline.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/ostream.hpp"
  #ifdef COMPILER1
--- 25,36 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "nativeInst_ppc.hpp"
! #include "oops/compressedOops.inline.hpp"
! #include "oops/oop.hpp"
  #include "runtime/handles.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/ostream.hpp"
  #ifdef COMPILER1
*** 192,202 ****
    }
  
    CodeBlob* cb = CodeCache::find_blob_unsafe(addr);
    if (MacroAssembler::is_set_narrow_oop(addr, cb->content_begin())) {
      narrowOop no = (narrowOop)MacroAssembler::get_narrow_oop(addr, cb->content_begin());
!     return cast_from_oop<intptr_t>(oopDesc::decode_heap_oop(no));
    } else {
      assert(MacroAssembler::is_load_const_from_method_toc_at(addr), "must be load_const_from_pool");
  
      address ctable = cb->content_begin();
      int offset = MacroAssembler::get_offset_of_load_const_from_method_toc_at(addr);
--- 193,203 ----
    }
  
    CodeBlob* cb = CodeCache::find_blob_unsafe(addr);
    if (MacroAssembler::is_set_narrow_oop(addr, cb->content_begin())) {
      narrowOop no = (narrowOop)MacroAssembler::get_narrow_oop(addr, cb->content_begin());
!     return cast_from_oop<intptr_t>(CompressedOops::decode(no));
    } else {
      assert(MacroAssembler::is_load_const_from_method_toc_at(addr), "must be load_const_from_pool");
  
      address ctable = cb->content_begin();
      int offset = MacroAssembler::get_offset_of_load_const_from_method_toc_at(addr);
*** 413,418 ****
    CodeBlob* cb = CodeCache::find_blob(addr_at(0));
    address ctable = cb->content_begin();
  
    *(address*)(ctable + destination_toc_offset()) = new_destination;
  }
- 
--- 414,418 ----