mirror of https://github.com/lua/lua
bug in tailcall of vararg functions
(when adjusting missing parameters)
This commit is contained in:
parent
53979dfe0d
commit
89110986d7
29
ldo.c
29
ldo.c
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
** $Id: ldo.c,v 2.186 2018/01/10 19:19:27 roberto Exp roberto $
|
||||
** $Id: ldo.c,v 2.187 2018/01/28 12:08:04 roberto Exp roberto $
|
||||
** Stack and Call structure of Lua
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
|
@ -405,25 +405,27 @@ void luaD_poscall (lua_State *L, CallInfo *ci, StkId firstResult, int nres) {
|
|||
|
||||
/*
|
||||
** Prepare a function for a tail call, building its call info on top
|
||||
** of the current call info. 'n' is the number of arguments plus 1
|
||||
** of the current call info. 'narg1' is the number of arguments plus 1
|
||||
** (so that it includes the function itself).
|
||||
*/
|
||||
void luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func, int n) {
|
||||
void luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func, int narg1) {
|
||||
Proto *p = clLvalue(s2v(func))->p;
|
||||
int fsize = p->maxstacksize; /* frame size */
|
||||
int nfixparams = p->numparams;
|
||||
int i;
|
||||
for (i = 0; i < n; i++) /* move down function and arguments */
|
||||
for (i = 0; i < narg1; i++) /* move down function and arguments */
|
||||
setobjs2s(L, ci->func + i, func + i);
|
||||
checkstackp(L, fsize, func);
|
||||
for (; i <= p->numparams; i++)
|
||||
setnilvalue(s2v(ci->func + i)); /* complete missing arguments */
|
||||
ci->top = ci->func + 1 + fsize; /* top for new function */
|
||||
func = ci->func; /* moved-down function */
|
||||
for (; narg1 <= nfixparams; narg1++)
|
||||
setnilvalue(s2v(func + narg1)); /* complete missing arguments */
|
||||
ci->top = func + 1 + fsize; /* top for new function */
|
||||
lua_assert(ci->top <= L->stack_last);
|
||||
ci->u.l.savedpc = p->code; /* starting point */
|
||||
ci->callstatus |= CIST_TAIL;
|
||||
if (p->is_vararg) {
|
||||
L->top -= (func - ci->func); /* move down top */
|
||||
luaT_adjustvarargs(L, p, n - 1);
|
||||
L->top = func + narg1; /* set top */
|
||||
luaT_adjustvarargs(L, nfixparams, narg1 - 1);
|
||||
}
|
||||
if (L->hookmask)
|
||||
hookcall(L, ci, 1);
|
||||
|
@ -464,12 +466,13 @@ void luaD_call (lua_State *L, StkId func, int nresults) {
|
|||
luaD_poscall(L, ci, L->top - n, n);
|
||||
break;
|
||||
}
|
||||
case LUA_TLCL: { /* Lua function: prepare its call */
|
||||
case LUA_TLCL: { /* Lua function */
|
||||
Proto *p = clLvalue(funcv)->p;
|
||||
int n = cast_int(L->top - func) - 1; /* number of real arguments */
|
||||
int narg = cast_int(L->top - func) - 1; /* number of real arguments */
|
||||
int nfixparams = p->numparams;
|
||||
int fsize = p->maxstacksize; /* frame size */
|
||||
checkstackp(L, fsize, func);
|
||||
for (; n < p->numparams; n++)
|
||||
for (; narg < nfixparams; narg++)
|
||||
setnilvalue(s2v(L->top++)); /* complete missing arguments */
|
||||
ci = next_ci(L); /* now 'enter' new function */
|
||||
ci->nresults = nresults;
|
||||
|
@ -479,7 +482,7 @@ void luaD_call (lua_State *L, StkId func, int nresults) {
|
|||
ci->u.l.savedpc = p->code; /* starting point */
|
||||
ci->callstatus = 0;
|
||||
if (p->is_vararg)
|
||||
luaT_adjustvarargs(L, p, n); /* may invoke GC */
|
||||
luaT_adjustvarargs(L, nfixparams, narg); /* may invoke GC */
|
||||
if (L->hookmask)
|
||||
hookcall(L, ci, 0);
|
||||
luaV_execute(L, ci); /* run the function */
|
||||
|
|
17
ltm.c
17
ltm.c
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
** $Id: ltm.c,v 2.56 2017/12/28 15:42:57 roberto Exp roberto $
|
||||
** $Id: ltm.c,v 2.57 2018/01/28 12:08:04 roberto Exp roberto $
|
||||
** Tag methods
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
|
@ -216,21 +216,20 @@ int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
|
|||
}
|
||||
|
||||
|
||||
void luaT_adjustvarargs (lua_State *L, Proto *p, int actual) {
|
||||
void luaT_adjustvarargs (lua_State *L, int nfixparams, int actual) {
|
||||
int i;
|
||||
Table *vtab;
|
||||
TValue nname;
|
||||
int nfixparams = p->numparams; /* number of fixed parameters */
|
||||
actual -= nfixparams; /* number of extra arguments */
|
||||
int nextra = actual - nfixparams; /* number of extra arguments */
|
||||
vtab = luaH_new(L); /* create vararg table */
|
||||
sethvalue2s(L, L->top, vtab); /* anchor it for resizing */
|
||||
L->top++; /* space ensured by caller */
|
||||
luaH_resize(L, vtab, actual, 1);
|
||||
for (i = 0; i < actual; i++) /* put extra arguments into vararg table */
|
||||
setobj2n(L, &vtab->array[i], s2v(L->top - actual + i - 1));
|
||||
luaH_resize(L, vtab, nextra, 1);
|
||||
for (i = 0; i < nextra; i++) /* put extra arguments into vararg table */
|
||||
setobj2n(L, &vtab->array[i], s2v(L->top - nextra + i - 1));
|
||||
setsvalue(L, &nname, G(L)->nfield); /* get field 'n' */
|
||||
setivalue(luaH_set(L, vtab, &nname), actual); /* store counter there */
|
||||
L->top -= actual; /* remove extra elements from the stack */
|
||||
setivalue(luaH_set(L, vtab, &nname), nextra); /* store counter there */
|
||||
L->top -= nextra; /* remove extra elements from the stack */
|
||||
sethvalue2s(L, L->top - 1, vtab); /* move table to new top */
|
||||
luaC_checkGC(L);
|
||||
}
|
||||
|
|
4
ltm.h
4
ltm.h
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
** $Id: ltm.h,v 2.27 2017/11/27 17:44:31 roberto Exp roberto $
|
||||
** $Id: ltm.h,v 2.28 2017/12/13 18:32:09 roberto Exp roberto $
|
||||
** Tag methods
|
||||
** See Copyright Notice in lua.h
|
||||
*/
|
||||
|
@ -77,7 +77,7 @@ LUAI_FUNC int luaT_callorderTM (lua_State *L, const TValue *p1,
|
|||
LUAI_FUNC int luaT_callorderiTM (lua_State *L, const TValue *p1, int v2,
|
||||
int inv, TMS event);
|
||||
|
||||
LUAI_FUNC void luaT_adjustvarargs (lua_State *L, Proto *p, int actual);
|
||||
LUAI_FUNC void luaT_adjustvarargs (lua_State *L, int nfixparams, int actual);
|
||||
LUAI_FUNC void luaT_getvarargs (lua_State *L, TValue *t, StkId where,
|
||||
int wanted);
|
||||
|
||||
|
|
Loading…
Reference in New Issue