nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrong error message when using "_ENV" fields

Browse Source 
The string "_ENV" is erroneously identified as a variable _ENV,
so that results from a field is classified as a global.
This commit is contained in:
Roberto Ierusalimschy
2025-03-14 15:16:09 -03:00
parent c2dc6e8e94
commit 94d38560c3
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ldebug.c
View File

@@ -33,6 +33,8 @@
#define LuaClosure(f) ((f) != NULL && (f)->c.tt == LUA_VLCL) #define LuaClosure(f) ((f) != NULL && (f)->c.tt == LUA_VLCL)
static const char strlocal[] = "local";
static const char strupval[] = "upvalue";
static const char *funcnamefromcall (lua_State *L, CallInfo *ci, static const char *funcnamefromcall (lua_State *L, CallInfo *ci,
const char **name); const char **name);
@@ -505,7 +507,7 @@ static const char *basicgetobjname (const Proto *p, int *ppc, int reg,
int pc = *ppc; int pc = *ppc;
*name = luaF_getlocalname(p, reg + 1, pc); *name = luaF_getlocalname(p, reg + 1, pc);
if (*name) /* is a local? */ if (*name) /* is a local? */
return "local"; return strlocal;
/* else try symbolic execution */ /* else try symbolic execution */
*ppc = pc = findsetreg(p, pc, reg); *ppc = pc = findsetreg(p, pc, reg);
if (pc != -1) { /* could find instruction? */ if (pc != -1) { /* could find instruction? */
@@ -520,7 +522,7 @@ static const char *basicgetobjname (const Proto *p, int *ppc, int reg,
} }
case OP_GETUPVAL: { case OP_GETUPVAL: {
*name = upvalname(p, GETARG_B(i)); *name = upvalname(p, GETARG_B(i));
return "upvalue"; return strupval;
} }
case OP_LOADK: return kname(p, GETARG_Bx(i), name); case OP_LOADK: return kname(p, GETARG_Bx(i), name);
case OP_LOADKX: return kname(p, GETARG_Ax(p->code[pc + 1]), name); case OP_LOADKX: return kname(p, GETARG_Ax(p->code[pc + 1]), name);
@@ -550,8 +552,13 @@ static const char *isEnv (const Proto *p, int pc, Instruction i, int isup) {
const char *name; /* name of indexed variable */ const char *name; /* name of indexed variable */
if (isup) /* is 't' an upvalue? */ if (isup) /* is 't' an upvalue? */
name = upvalname(p, t); name = upvalname(p, t);
else /* 't' is a register */ else { /* 't' is a register */
basicgetobjname(p, &pc, t, &name); const char *what = basicgetobjname(p, &pc, t, &name);
/* 'name' must be the name of a local variable (at the current
level or an upvalue) */
if (what != strlocal && what != strupval)
name = NULL; /* cannot be the variable _ENV */
}
return (name && strcmp(name, LUA_ENV) == 0) ? "global" : "field"; return (name && strcmp(name, LUA_ENV) == 0) ? "global" : "field";
} }
@@ -698,7 +705,7 @@ static const char *getupvalname (CallInfo *ci, const TValue *o,
for (i = 0; i < c->nupvalues; i++) { for (i = 0; i < c->nupvalues; i++) {
if (c->upvals[i]->v.p == o) { if (c->upvals[i]->v.p == o) {
*name = upvalname(c->p, i); *name = upvalname(c->p, i);
return "upvalue"; return strupval;
} }
} }
return NULL; return NULL;

2
ltests.c
View File

@@ -982,7 +982,7 @@ static int gc_printobj (lua_State *L) {
} }
static const char *statenames[] = { static const char *const statenames[] = {
"propagate", "enteratomic", "atomic", "sweepallgc", "sweepfinobj", "propagate", "enteratomic", "atomic", "sweepallgc", "sweepfinobj",
"sweeptobefnz", "sweepend", "callfin", "pause", ""}; "sweeptobefnz", "sweepend", "callfin", "pause", ""};

3
testes/errors.lua
View File

@@ -162,6 +162,9 @@ checkmessage("aaa=(1)..{}", "a table value")
-- bug in 5.4.6 -- bug in 5.4.6
checkmessage("a = {_ENV = {}}; print(a._ENV.x + 1)", "field 'x'") checkmessage("a = {_ENV = {}}; print(a._ENV.x + 1)", "field 'x'")
-- a similar bug, since 5.4.0
checkmessage("print(('_ENV').x + 1)", "field 'x'")
_G.aaa, _G.bbbb = nil _G.aaa, _G.bbbb = nil
-- calls -- calls