--- old/src/cpu/aarch64/vm/templateTable_aarch64.cpp	2017-09-11 10:27:55.598547778 -0700
+++ new/src/cpu/aarch64/vm/templateTable_aarch64.cpp	2017-09-11 10:27:55.516540180 -0700
@@ -2195,6 +2195,11 @@
     __ bind(skip_register_finalizer);
   }
 
+  // Explicitly reset last_sp, for handling special case in TemplateInterpreter::deopt_reexecute_entry
+  if (state == vtos) {
+    __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+  }
+
   // Issue a StoreStore barrier after all stores but before return
   // from any constructor for any class with a final field.  We don't
   // know if this is a finalizer, so we always do so.