Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2014-02-20 15:09:02 +01:00
7 changed files with 18 additions and 12 deletions

View File

@@ -764,7 +764,7 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults)
(J->parent == 0 && J->exitno == 0 &&
!bc_isret(bc_op(J->cur.startins))))) {
/* NYI: specialize to frame type and return directly, not via RET*. */
for (i = -1; i < (ptrdiff_t)rbase; i++)
for (i = 0; i < (ptrdiff_t)rbase; i++)
J->base[i] = 0; /* Purge dead slots. */
J->maxslot = rbase + (BCReg)gotresults;
lj_record_stop(J, LJ_TRLINK_RETURN, 0); /* Return to interpreter. */