*** old/src/cpu/x86/vm/relocInfo_x86.cpp	Mon May 19 21:11:12 2008
--- new/src/cpu/x86/vm/relocInfo_x86.cpp	Mon May 19 21:11:12 2008

*** 28,42 ****
--- 28,46 ----
  
  void Relocation::pd_set_data_value(address x, intptr_t o) {
  #ifdef AMD64
    x += o;
    typedef Assembler::WhichOperand WhichOperand;
!   WhichOperand which = (WhichOperand) format(); // that is, disp32 or imm64, call32, narrow oop
    assert(which == Assembler::disp32_operand ||
+          which == Assembler::narrow_oop_operand ||
           which == Assembler::imm64_operand, "format unpacks ok");
    if (which == Assembler::imm64_operand) {
      *pd_address_in_code() = x;
+   } else if (which == Assembler::narrow_oop_operand) {
+     address disp = Assembler::locate_operand(addr(), which);
+     *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
    } else {
      // Note:  Use runtime_call_type relocations for call32_operand.
      address ip = addr();
      address disp = Assembler::locate_operand(ip, which);
      address next_ip = Assembler::locate_next_instruction(ip);