src/hotspot/cpu/s390/macroAssembler_s390.cpp

*** 31,40 ****
--- 31,41 ----
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
+ #include "oops/compressedOops.inline.hpp"
  #include "oops/klass.inline.hpp"
  #include "opto/compile.hpp"
  #include "opto/intrinsicnode.hpp"
  #include "opto/matcher.hpp"
  #include "prims/methodHandles.hpp"
*** 1284,1294 ****
  // Patching the immediate value of CPU version dependent load_narrow_oop sequence.
  // The passed ptr must NOT be in compressed format!
  int MacroAssembler::patch_load_narrow_oop(address pos, oop o) {
    assert(UseCompressedOops, "Can only patch compressed oops");
  
!   narrowOop no = oopDesc::encode_heap_oop(o);
    return patch_load_const_32to64(pos, no);
  }
  
  // Patching the immediate value of CPU version dependent load_narrow_klass sequence.
  // The passed ptr must NOT be in compressed format!
--- 1285,1295 ----
  // Patching the immediate value of CPU version dependent load_narrow_oop sequence.
  // The passed ptr must NOT be in compressed format!
  int MacroAssembler::patch_load_narrow_oop(address pos, oop o) {
    assert(UseCompressedOops, "Can only patch compressed oops");
  
!   narrowOop no = CompressedOops::encode(o);
    return patch_load_const_32to64(pos, no);
  }
  
  // Patching the immediate value of CPU version dependent load_narrow_klass sequence.
  // The passed ptr must NOT be in compressed format!
*** 1302,1312 ****
  // Patching the immediate value of CPU version dependent compare_immediate_narrow_oop sequence.
  // The passed ptr must NOT be in compressed format!
  int MacroAssembler::patch_compare_immediate_narrow_oop(address pos, oop o) {
    assert(UseCompressedOops, "Can only patch compressed oops");
  
!   narrowOop no = oopDesc::encode_heap_oop(o);
    return patch_compare_immediate_32(pos, no);
  }
  
  // Patching the immediate value of CPU version dependent compare_immediate_narrow_klass sequence.
  // The passed ptr must NOT be in compressed format!
--- 1303,1313 ----
  // Patching the immediate value of CPU version dependent compare_immediate_narrow_oop sequence.
  // The passed ptr must NOT be in compressed format!
  int MacroAssembler::patch_compare_immediate_narrow_oop(address pos, oop o) {
    assert(UseCompressedOops, "Can only patch compressed oops");
  
!   narrowOop no = CompressedOops::encode(o);
    return patch_compare_immediate_32(pos, no);
  }
  
  // Patching the immediate value of CPU version dependent compare_immediate_narrow_klass sequence.
  // The passed ptr must NOT be in compressed format!