Skip to content

Track recursion on LClosure not Proto. #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
Sep 2, 2026
+66 −56
Merged

Track recursion on LClosure not Proto. #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 38 additions & 40 deletions src/ldo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ l_sinline CallInfo *prepCallInfo (lua_State *L, StkId func, unsigned status,
return ci;
}


/*
** precall for C functions
*/
Expand Down Expand Up @@ -694,7 +693,30 @@ int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
case LUA_VLCF: /* light C function */
return precallC(L, func, status, fvalue(s2v(func)));
case LUA_VLCL: { /* Lua function */
Proto *p = clLvalue(s2v(func))->p;
LClosure *cl = clLvalue(s2v(func));
Proto *p = cl->p;
#ifdef USE_YK
if (yk_is_interpreting()) {
// If this is a recursive call and we don't yet have a yk_location,
// create one now.
LClosure *caller_cl = ci_func(ci);
if (cl->called && yk_location_is_null(p->yklocs[0])) {
p->yklocs[0] = yk_location_new();
#if YKLUA_DEBUG_STRS
yk_location_set_debug_str(&p->yklocs[0], p->instdebugstrs[0]);
#endif
} else {
// Because this is a tail call the "current" function -- `caller_p`
// -- has implicitly returned. If the "current" function is the same
// as the "about to call" function, we don't do anything; in all
// other cases we mark the "current" function as uncalled.
if (!cl->called)
cl->called = true;
if (caller_cl != cl)
caller_cl->called = false;
}
}
#endif
int fsize = p->maxstacksize; /* frame size */
int nfixparams = p->numparams;
int i;
Expand All @@ -707,27 +729,6 @@ int luaD_pretailcall (lua_State *L, CallInfo *ci, StkId func,
setnilvalue(s2v(func + narg1)); /* complete missing arguments */
ci->top.p = func + 1 + fsize; /* top for new function */
lua_assert(ci->top.p <= L->stack_last.p);
#ifdef USE_YK
if (yk_is_interpreting()) {
// If this is a recursive call and we don't yet have a yk_location,
// create one now.
if (p->called && yk_location_is_null(p->yklocs[0])) {
p->yklocs[0] = yk_location_new();
#if YKLUA_DEBUG_STRS
yk_location_set_debug_str(&p->yklocs[0], p->instdebugstrs[0]);
#endif
} else if (!p->called) {
p->called = true;
}
// Because this is a tail call the "current" function -- `caller_p` --
// has implicitly returned. If the "current" function is the same as
// the "about to call" function, we don't do anything; in all other
// cases we mark the "current" function as uncalled.
Proto *caller_p = ci_func(ci)->p;
if (caller_p != p)
caller_p->called = false;
}
#endif
ci->u.l.savedpc = p->code; /* starting point */
ci->callstatus |= CIST_TAIL;
L->top.p = func + narg1; /* set top */
Expand Down Expand Up @@ -765,30 +766,29 @@ CallInfo *luaD_precall (lua_State *L, StkId func, int nresults) {
return NULL;
case LUA_VLCL: { /* Lua function */
CallInfo *ci;
Proto *p = clLvalue(s2v(func))->p;
int narg = cast_int(L->top.p - func) - 1; /* number of real arguments */
int nfixparams = p->numparams;
int fsize = p->maxstacksize; /* frame size */
checkstackp(L, fsize, func);
L->ci = ci = prepCallInfo(L, func, status, func + 1 + fsize);
ci->u.l.savedpc = p->code; /* starting point */
for (; narg < nfixparams; narg++)
setnilvalue(s2v(L->top.p++)); /* complete missing arguments */
lua_assert(ci->top.p <= L->stack_last.p);
LClosure *cl = clLvalue(s2v(func));
Proto *p = cl->p;
#ifdef USE_YK
if (yk_is_interpreting()) {
// If this is a recursive call and we don't yet have a yk_location,
// create one now.
if (p->called && yk_location_is_null(p->yklocs[0])) {
if (cl->called && yk_location_is_null(p->yklocs[0])) {
p->yklocs[0] = yk_location_new();
#if YKLUA_DEBUG_STRS
yk_location_set_debug_str(&p->yklocs[0], p->instdebugstrs[0]);
#endif
} else if (!p->called) {
p->called = true;
}
else if (!cl->called)
cl->called = true;
}
#endif
int narg = cast_int(L->top.p - func) - 1; /* number of real arguments */
int nfixparams = p->numparams;
int fsize = p->maxstacksize; /* frame size */
checkstackp(L, fsize, func);
L->ci = ci = prepCallInfo(L, func, status, func + 1 + fsize);
ci->u.l.savedpc = p->code; /* starting point */
for (; narg < nfixparams; narg++)
setnilvalue(s2v(L->top.p++)); /* complete missing arguments */
lua_assert(ci->top.p <= L->stack_last.p);
return ci;
}
default: { /* not a function */
Expand Down Expand Up @@ -1214,5 +1214,3 @@ TStatus luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
decnny(L);
return status;
}


5 changes: 3 additions & 2 deletions src/lfunc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ LClosure *luaF_newLclosure (lua_State *L, int nupvals) {
GCObject *o = luaC_newobj(L, LUA_VLCL, sizeLclosure(nupvals));
LClosure *c = gco2lcl(o);
c->p = NULL;
#ifdef USE_YK
c->called = false;
#endif
c->nupvalues = cast_byte(nupvals);
while (nupvals--) c->upvals[nupvals] = NULL;
return c;
Expand Down Expand Up @@ -271,7 +274,6 @@ Proto *luaF_newproto (lua_State *L) {
f->lastlinedefined = 0;
f->source = NULL;
#ifdef USE_YK
f->called = false;
f->yklocs = NULL;
#ifdef YKLUA_DEBUG_STRS
f->instdebugstrs = NULL;
Expand Down Expand Up @@ -338,4 +340,3 @@ const char *luaF_getlocalname (const Proto *f, int local_number, int pc) {
}
return NULL; /* not found */
}

17 changes: 9 additions & 8 deletions src/lobject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,13 +619,6 @@ typedef struct Proto {
TValue *k; /* constants used by the function */
Instruction *code; /* opcodes */
#ifdef USE_YK
/* Used to detect recursive function calls. When a function is
* called this is set to `true` and when we return it is set to `false`. This
* works because a recursive function call must detect the `true` case before
* the bit is flipped. In other words, `called` being `false` does not mean
* "this isn't a recursive call", but if it's `true` it definitely is a
* recursive call. */
bool called;
YkLocation *yklocs; /* One 'YkLocation' per instruction in 'code' */
#ifdef YKLUA_DEBUG_STRS
char **instdebugstrs; /* One `char *` per instruction in `code` */
Expand Down Expand Up @@ -724,6 +717,15 @@ typedef struct CClosure {
typedef struct LClosure {
ClosureHeader;
struct Proto *p;
#ifdef USE_YK
/* Used to detect recursive function calls. When a closure is
* called this is set to `true` and when we return it is set to `false`. This
* works because a recursive function call must detect the `true` case before
* the bit is flipped. In other words, `called` being `false` does not mean
* "this isn't a recursive call", but if it's `true` it definitely is a
* recursive call. */
bool called;
#endif
UpVal *upvals[1]; /* list of upvalues */
} LClosure;

Expand Down Expand Up @@ -879,4 +881,3 @@ LUAI_FUNC void luaO_chunkid (char *out, const char *source, size_t srclen);


#endif

22 changes: 16 additions & 6 deletions src/lvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,6 @@ Instruction load_inst(uint64_t pv, const Instruction *pc) {
#define vmcase(l) case l:
#define vmbreak break


void luaV_execute (lua_State *L, CallInfo *ci) {
LClosure *cl;
TValue *k;
Expand Down Expand Up @@ -1854,6 +1853,10 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
vmbreak;
}
vmcase(OP_TAILCALL) {
#ifdef USE_YK
if (yk_is_interpreting())
cl->called = false;
#endif
StkId ra = RA(i);
int b = GETARG_B(i); /* number of arguments + 1 (function) */
int n; /* number of results when calling a C function */
Expand All @@ -1880,6 +1883,10 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
}
}
vmcase(OP_RETURN) {
#ifdef USE_YK
if (yk_is_interpreting())
cl->called = false;
#endif
StkId ra = RA(i);
int n = GETARG_B(i) - 1; /* number of results */
int nparams1 = GETARG_C(i);
Expand All @@ -1902,6 +1909,10 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
goto ret;
}
vmcase(OP_RETURN0) {
#ifdef USE_YK
if (yk_is_interpreting())
cl->called = false;
#endif
if (l_unlikely(L->hookmask)) {
StkId ra = RA(i);
L->top.p = ra;
Expand All @@ -1919,6 +1930,10 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
goto ret;
}
vmcase(OP_RETURN1) {
#ifdef USE_YK
if (yk_is_interpreting())
cl->called = false;
#endif
if (l_unlikely(L->hookmask)) {
StkId ra = RA(i);
L->top.p = ra + 1;
Expand All @@ -1940,11 +1955,6 @@ void luaV_execute (lua_State *L, CallInfo *ci) {
}
}
ret: /* return from a Lua function */
#ifdef USE_YK
if (yk_is_interpreting()) {
cl->p->called = false;
}
#endif
if (ci->callstatus & CIST_FRESH)
return; /* end this frame */
else {
Expand Down