44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
From 1f3c6f4534c6411313361697d98d1145a1f030fa Mon Sep 17 00:00:00 2001
|
|
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
|
|
Date: Tue, 15 Feb 2022 12:28:46 -0300
|
|
Subject: [PATCH] Bug: Lua can generate wrong code when _ENV is <const>
|
|
|
|
---
|
|
lparser.c | 1 +
|
|
testes/attrib.lua | 10 ++++++++++
|
|
2 files changed, 11 insertions(+)
|
|
|
|
diff --git a/lparser.c b/lparser.c
|
|
index 3abe3d751..a5cd55257 100644
|
|
--- a/src/lparser.c
|
|
+++ b/src/lparser.c
|
|
@@ -468,6 +468,7 @@ static void singlevar (LexState *ls, expdesc *var) {
|
|
expdesc key;
|
|
singlevaraux(fs, ls->envn, var, 1); /* get environment variable */
|
|
lua_assert(var->k != VVOID); /* this one must exist */
|
|
+ luaK_exp2anyregup(fs, var); /* but could be a constant */
|
|
codestring(&key, varname); /* key is variable name */
|
|
luaK_indexed(fs, var, &key); /* env[varname] */
|
|
}
|
|
diff --git a/testes/attrib.lua b/testes/attrib.lua
|
|
index b1076c768..83821c069 100644
|
|
--- lua-5.4.4/lua-5.4.4-tests/attrib.lua
|
|
+++ lua-5.4.4/lua-5.4.4-tests/attrib.lua
|
|
@@ -434,6 +434,16 @@ a.aVeryLongName012345678901234567890123456789012345678901234567890123456789 ==
|
|
10)
|
|
|
|
|
|
+do
|
|
+ -- _ENV constant
|
|
+ local function foo ()
|
|
+ local _ENV <const> = 11
|
|
+ X = "hi"
|
|
+ end
|
|
+ local st, msg = pcall(foo)
|
|
+ assert(not st and string.find(msg, "number"))
|
|
+end
|
|
+
|
|
|
|
-- test of large float/integer indices
|
|
|