Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2013-09-13 00:35:27 +02:00
commit da1456584b

View File

@ -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;
}