--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Fri Sep 29 10:44:58 2017 +0200
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Tue Oct 03 16:42:04 2017 -0400
@@ -2963,6 +2963,7 @@
              cp_base_offset + ConstantPoolCacheEntry::f1_offset()));
     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
     __ ldr(Robj, Address(Robj, mirror_offset));
+    __ resolve_oop_handle(Robj);
   }
 }