--- old/src/cpu/aarch64/vm/templateTable_aarch64.cpp	2016-12-19 16:04:56.088776753 -0500
+++ new/src/cpu/aarch64/vm/templateTable_aarch64.cpp	2016-12-19 16:04:56.024778505 -0500
@@ -3446,7 +3446,7 @@
     }
     __ str(rscratch1, Address(r0, oopDesc::mark_offset_in_bytes()));
     __ store_klass_gap(r0, zr);  // zero klass gap for compressed oops
-    __ store_klass(r0, r4);      // store klass last
+    __ store_klass(r0, r4, rscratch1);      // store klass last
 
     {
       SkipIfEqual skip(_masm, &DTraceAllocProbes, false);