--- old/src/hotspot/cpu/x86/templateTable_x86.cpp	2017-09-25 13:04:51.935451380 -0400
+++ new/src/hotspot/cpu/x86/templateTable_x86.cpp	2017-09-25 13:04:51.492631119 -0400
@@ -2665,6 +2665,7 @@
                                     ConstantPoolCacheEntry::f1_offset())));
     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
     __ movptr(obj, Address(obj, mirror_offset));
+    __ resolve_oop_handle(obj);
   }
 }