Merge branch 'master' into v2.1

1 files changed, 6 insertions, 3 deletions

diff --git a/src/lj_snap.c b/src/lj_snap.c
index 30ff9152..a25e4601 100644
--- a/src/lj_snap.c
+++ b/src/lj_snap.c
@@ -845,12 +845,15 @@ const BCIns *lj_snap_restore(jit_State *J, void *exptr)
 
   /* Compute current stack top. */
   switch (bc_op(*pc)) {
+  default:
+    if (bc_op(*pc) < BC_FUNCF) {
+      L->top = curr_topL(L);
+      break;
+    }
+    /* fallthrough */
   case BC_CALLM: case BC_CALLMT: case BC_RETM: case BC_TSETM:
     L->top = frame + snap->nslots;
     break;
-  default:
-    L->top = curr_topL(L);
-    break;
   }
   return pc;
 }