--- old/src/cpu/x86/vm/templateTable_x86.cpp	2017-09-06 11:30:34.845808247 -0400
+++ new/src/cpu/x86/vm/templateTable_x86.cpp	2017-09-06 11:30:34.598925558 -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);
   }
 }