--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Thu May 17 00:23:28 2018 -0700
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Thu May 17 09:35:38 2018 +0200
@@ -6276,6 +6276,8 @@
 
 // ((OopHandle)result).resolve();
 void MacroAssembler::resolve_oop_handle(Register result, Register tmp) {
+  assert_different_registers(result, tmp);
+
   // Only 64 bit platforms support GCs that require a tmp register
   // Only IN_HEAP loads require a thread_tmp register
   // OopHandle::resolve is an indirection like jobject.

--- a/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp	Thu May 17 00:23:28 2018 -0700
+++ b/src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp	Thu May 17 09:35:38 2018 +0200
@@ -973,7 +973,7 @@
     __ testl(t, JVM_ACC_STATIC);
     __ jcc(Assembler::zero, L);
     // get mirror
-    __ load_mirror(t, method);
+    __ load_mirror(t, method, rax);
     // copy mirror into activation frame
     __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize),
             t);