src/cpu/x86/vm/relocInfo_x86.cpp

rev 11777 : [mq]: gcinterface.patch

*** 46,56 ****
        *pd_address_in_code() = x;
      }
    } else if (which == Assembler::narrow_oop_operand) {
      address disp = Assembler::locate_operand(addr(), which);
      // both compressed oops and compressed classes look the same
!     if (Universe::heap()->is_in_reserved((oop)x)) {
      if (verify_only) {
        guarantee(*(uint32_t*) disp == oopDesc::encode_heap_oop((oop)x), "instructions must match");
      } else {
        *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
      }
--- 46,56 ----
        *pd_address_in_code() = x;
      }
    } else if (which == Assembler::narrow_oop_operand) {
      address disp = Assembler::locate_operand(addr(), which);
      // both compressed oops and compressed classes look the same
!     if (GC::gc()->heap()->is_in_reserved((oop)x)) {
      if (verify_only) {
        guarantee(*(uint32_t*) disp == oopDesc::encode_heap_oop((oop)x), "instructions must match");
      } else {
        *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
      }