--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Thu Apr 05 14:25:53 2018 +0200
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp	Mon Apr 09 13:38:45 2018 +0200
@@ -6624,25 +6624,6 @@
     movptr(dst, src);
 }
 
-void MacroAssembler::cmp_heap_oop(Register src1, Address src2, Register tmp) {
-  assert_different_registers(src1, tmp);
-#ifdef _LP64
-  if (UseCompressedOops) {
-    bool did_push = false;
-    if (tmp == noreg) {
-      tmp = rax;
-      push(tmp);
-      did_push = true;
-      assert(!src2.uses(rsp), "can't push");
-    }
-    load_heap_oop(tmp, src2);
-    cmpptr(src1, tmp);
-    if (did_push)  pop(tmp);
-  } else
-#endif
-    cmpptr(src1, src2);
-}
-
 // Used for storing NULLs.
 void MacroAssembler::store_heap_oop_null(Address dst) {
 #ifdef _LP64

--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp	Thu Apr 05 14:25:53 2018 +0200
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp	Mon Apr 09 13:38:45 2018 +0200
@@ -337,7 +337,6 @@
   void load_heap_oop(Register dst, Address src);
   void load_heap_oop_not_null(Register dst, Address src);
   void store_heap_oop(Address dst, Register src);
-  void cmp_heap_oop(Register src1, Address src2, Register tmp = noreg);
 
   // Used for storing NULL. All other oop constants should be
   // stored using routines that take a jobject.