DrSocalkwe3n/luajit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall
2014-02-28 14:10:30 +01:00
parent b342b7a0eb e94150877d
commit fd3354a9dd
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lj_record.c
View File

@@ -1603,10 +1603,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
} else if (dst + nresults > J->maxslot) {
J->maxslot = dst + (BCReg)nresults;
}
for (i = 0; i < nresults; i++) {
J->base[dst+i] = i < nvararg ? J->base[i - nvararg - 1] : TREF_NIL;
lua_assert(J->base[dst+i] != 0);
}
for (i = 0; i < nresults; i++)
J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1) : TREF_NIL;
} else { /* Unknown number of varargs passed to trace. */
TRef fr = emitir(IRTI(IR_SLOAD), 0, IRSLOAD_READONLY|IRSLOAD_FRAME);
int32_t frofs = 8*(1+numparams)+FRAME_VARG;