Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH luajit] test: adapt test checking global environment
@ 2021-10-06 13:04 Maxim Kokryashkin via Tarantool-patches
  2021-12-16 14:34 ` Sergey Kaplun via Tarantool-patches
  2022-02-17 16:34 ` Igor Munkin via Tarantool-patches
  0 siblings, 2 replies; 9+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-10-06 13:04 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun, m.shishatskiy

LuaJIT doesn't take into account tail calls for
call-level counting, so `getfenv()` behaviour is different
in tail calls. getfenv()` default level is 1 which is invalid for
the test case when is called from tail call (`lj_debug_frame()`
returns NULL).

This commits adds local varibles, so there is no tail call any more.

Part of tarantool/tarantool#5870
---
Issue: https://github.com/tarantool/tarantool/issues/5713
GitHub branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5713-adapt-test-global-environment-PUC-Rio
CI: https://github.com/tarantool/tarantool/tree/fckxorg/gh-5713-adapt-test-global-environment-PUC-Rio

 test/PUC-Rio-Lua-5.1-tests/closure.lua | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/test/PUC-Rio-Lua-5.1-tests/closure.lua b/test/PUC-Rio-Lua-5.1-tests/closure.lua
index 551fe70d..86f6ad87 100644
--- a/test/PUC-Rio-Lua-5.1-tests/closure.lua
+++ b/test/PUC-Rio-Lua-5.1-tests/closure.lua
@@ -167,22 +167,23 @@ local function foo (a)
   assert(getfenv(0) == a)
   assert(getfenv(1) == _G)
   assert(getfenv(loadstring"") == a)
-  return getfenv()
+
+-- LuaJIT doesn't take into account tail calls for
+-- call-level counting, so `getfenv()` behaviour is different
+-- in tail calls. For example, `pcall()` to this functon returns false
+-- in case of tailcall, because `getfenv()` default level is 1 which
+-- is invalid for this case (`lj_debug_frame()` returns NULL).
+-- See also https://github.com/tarantool/tarantool/issues/5713.
+  local env = getfenv()
+  return env
 end
 
 f = coroutine.wrap(foo)
 local a = {}
 assert(f(a) == _G)
 local a,b = pcall(f)
--- FIXME: LuaJIT doesn't take into account tail calls for
--- call-level counting, so `getfenv()` behaviour is different
--- in tail calls. For example, this `pcall()` returns false,
--- because `getfenv()` default level is 1 which is invalid for
--- this case when is called from tail call (`lj_debug_frame()`
--- returns NULL).
--- See also https://github.com/tarantool/tarantool/issues/5713.
--- Test is disabled for LuaJIT for now.
--- assert(a and b == _G)
+-- Test is adapted to the behavior LuaJIT. See the comment above.
+assert(a and b == _G)
 
 
 -- tests for multiple yield/resume arguments
-- 
2.33.0


^ permalink raw reply	[flat|nested] 9+ messages in thread
* [Tarantool-patches] [PATCH luajit] test: adapt test checking global environment
@ 2021-09-24 18:20 Maxim Kokryashkin via Tarantool-patches
  2021-10-05 17:37 ` Sergey Kaplun via Tarantool-patches
  0 siblings, 1 reply; 9+ messages in thread
From: Maxim Kokryashkin via Tarantool-patches @ 2021-09-24 18:20 UTC (permalink / raw)
  To: tarantool-patches, imun, skaplun

LuaJIT doesn't take into account tail calls for
call-level counting, so `getfenv()` behaviour is different
in tail calls. getfenv()` default level is 1 which is invalid for
the test case when is called from tail call (`lj_debug_frame()`
returns NULL).

This commits adds local varible, so there is no tail call any more.

Closes tarantool/tarantool#5713
Part of tarantool/tarantool#5845
Part of tarantool/tarantool#4473
---
Issue: https://github.com/tarantool/tarantool/issues/5713
GitHub branch: https://github.com/tarantool/luajit/tree/fckxorg/gh-5713-adapt-test-global-environment-PUC-Rio

 test/PUC-Rio-Lua-5.1-tests/closure.lua | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/PUC-Rio-Lua-5.1-tests/closure.lua b/test/PUC-Rio-Lua-5.1-tests/closure.lua
index 551fe70d..c0377179 100644
--- a/test/PUC-Rio-Lua-5.1-tests/closure.lua
+++ b/test/PUC-Rio-Lua-5.1-tests/closure.lua
@@ -167,22 +167,24 @@ local function foo (a)
   assert(getfenv(0) == a)
   assert(getfenv(1) == _G)
   assert(getfenv(loadstring"") == a)
-  return getfenv()
+  local env = getfenv()
+  return env
 end
 
 f = coroutine.wrap(foo)
 local a = {}
 assert(f(a) == _G)
 local a,b = pcall(f)
--- FIXME: LuaJIT doesn't take into account tail calls for
+-- LuaJIT doesn't take into account tail calls for
 -- call-level counting, so `getfenv()` behaviour is different
 -- in tail calls. For example, this `pcall()` returns false,
 -- because `getfenv()` default level is 1 which is invalid for
 -- this case when is called from tail call (`lj_debug_frame()`
 -- returns NULL).
 -- See also https://github.com/tarantool/tarantool/issues/5713.
--- Test is disabled for LuaJIT for now.
--- assert(a and b == _G)
+
+-- Test is adapted to the behavior LuaJIT.
+assert(a and b == _G)
 
 
 -- tests for multiple yield/resume arguments
-- 
2.33.0


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2022-02-17 16:37 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-06 13:04 [Tarantool-patches] [PATCH luajit] test: adapt test checking global environment Maxim Kokryashkin via Tarantool-patches
2021-12-16 14:34 ` Sergey Kaplun via Tarantool-patches
2022-01-17 23:42   ` Максим Корякшин via Tarantool-patches
2022-01-26 22:33     ` Igor Munkin via Tarantool-patches
2022-02-07  9:32       ` Максим Корякшин via Tarantool-patches
2022-01-17 23:43   ` Максим Корякшин via Tarantool-patches
2022-02-17 16:34 ` Igor Munkin via Tarantool-patches
  -- strict thread matches above, loose matches on Subject: below --
2021-09-24 18:20 Maxim Kokryashkin via Tarantool-patches
2021-10-05 17:37 ` Sergey Kaplun via Tarantool-patches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox