--- a/src/hotspot/cpu/x86/templateTable_x86.cpp	Fri Sep 29 10:44:58 2017 +0200
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp	Tue Oct 03 16:42:04 2017 -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);
   }
 }