--- old/src/cpu/x86/vm/interp_masm_x86.cpp	2017-08-11 17:44:57.595120019 -0400
+++ new/src/cpu/x86/vm/interp_masm_x86.cpp	2017-08-11 17:44:57.138458759 -0400
@@ -511,8 +511,7 @@
   // load pointer for resolved_references[] objArray
   movptr(result, Address(result, ConstantPool::cache_offset_in_bytes()));
   movptr(result, Address(result, ConstantPoolCache::resolved_references_offset_in_bytes()));
-  // JNIHandles::resolve(obj);
-  movptr(result, Address(result, 0));
+  resolve_oop_handle(result);
   // Add in the index
   addptr(result, tmp);
   load_heap_oop(result, Address(result, arrayOopDesc::base_offset_in_bytes(T_OBJECT)));