src/cpu/x86/vm/macroAssembler_x86.cpp

*** 6602,6611 ****
--- 6602,6617 ----
      call(RuntimeAddress(StubRoutines::x86::verify_fpu_cntrl_wrd_entry()));
    }
  #endif // _LP64
  }
  
+ // ((OopHandle)result).resolve();
+ void MacroAssembler::resolve_oop_handle(Register result) {
+   // OopHandle::resolve is an indirection.
+   movptr(result, Address(result, 0));
+ }
+ 
  void MacroAssembler::load_mirror(Register mirror, Register method) {
    // get mirror
    const int mirror_offset = in_bytes(Klass::java_mirror_offset());
    movptr(mirror, Address(method, Method::const_offset()));
    movptr(mirror, Address(mirror, ConstMethod::constants_offset()));
*** 7028,7038 ****
    }
  }
  
  #endif // _LP64
  
- 
  // C2 compiled method's prolog code.
  void MacroAssembler::verified_entry(int framesize, int stack_bang_size, bool fp_mode_24b) {
  
    // WARNING: Initial instruction MUST be 5 bytes or longer so that
    // NativeJump::patch_verified_entry will be able to patch out the entry
--- 7034,7043 ----