--- 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.