--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Mon Sep 04 19:50:01 2017 +0200
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Tue Oct 24 06:06:56 2017 -0700
@@ -2195,6 +2195,13 @@
     __ bind(skip_register_finalizer);
   }
 
+  // Explicitly reset last_sp, for handling special case in TemplateInterpreter::deopt_reexecute_entry
+#ifdef ASSERT
+  if (state == vtos) {
+    __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
+  }
+#endif
+
   // 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.