--- old/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2017-09-25 13:04:45.238982035 -0400
+++ new/src/hotspot/cpu/x86/macroAssembler_x86.cpp	2017-09-25 13:04:44.696074782 -0400
@@ -6617,6 +6617,7 @@
   movptr(mirror, Address(mirror, ConstMethod::constants_offset()));
   movptr(mirror, Address(mirror, ConstantPool::pool_holder_offset_in_bytes()));
   movptr(mirror, Address(mirror, mirror_offset));
+  resolve_oop_handle(mirror);
 }
 
 void MacroAssembler::load_klass(Register dst, Register src) {