--- old/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	2017-09-25 13:03:41.591446827 -0400
+++ new/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	2017-09-25 13:03:41.159967901 -0400
@@ -2297,6 +2297,7 @@
                                         ConstantPoolCacheEntry::f1_offset())));
     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
     __ ldr(obj, Address(obj, mirror_offset));
+    __ resolve_oop_handle(obj);
   }
 }