Sergey,

Thanks for the fixes! I've made several touches here[1] and there[2][3]
to make the patch LGTM.

[1]: https://github.com/tarantool/luajit/commit/bf239af
[2]: https://github.com/tarantool/luajit/commit/aa17343
[3]: https://github.com/tarantool/luajit/commit/ee2f6ce

On 20.10.23, Sergey Bronnikov wrote:

 From: Sergey Bronnikov <sergeyb@tarantool.org>
 
 Epic: https://github.com/tarantool/tarantool/pull/9145
 PR: https://github.com/tarantool/tarantool/pull/8913
 Related issue: https://github.com/LuaJIT/LuaJIT/issues/549
 Branch: https://github.com/tarantool/luajit/tree/ligurio/lj-549-fix-embedded-bytecode-loader
 Patches v1: https://lists.tarantool.org/tarantool-patches/cover.1690300762.git.sergeyb@tarantool.org/
 Patches v2: https://lists.tarantool.org/tarantool-patches/cover.1693480177.git.sergeyb@tarantool.org/T/#t
 
 Changes v3:
 - removed fio helpers
 - build shared library by CMake
 
 Changes v2:
 - added a Lua test that reproduces a problem like reproducer do
 - added fixes according to comments from Maxim K. and Sergey K.
 
 Mike Pall (2):
   Fix embedded bytecode loader.
   Followup fix for embedded bytecode loader.
 
  src/lib_package.c | 4 +-
  src/lj_bcread.c | 10 +-
  src/lj_lex.c | 7 ++
  src/lj_lex.h | 1 +
  test/tarantool-c-tests/lj-549-lua-load.test.c | 111 ++++++++++++++++++
  test/tarantool-tests/CMakeLists.txt | 1 +
  .../lj-549-bytecode-loader.test.lua | 27 +++++
  .../lj-549-bytecode-loader/CMakeLists.txt | 20 ++++
  .../lj-549-bytecode-loader/script.lua | 3 +
  9 files changed, 177 insertions(+), 7 deletions(-)
  create mode 100644 test/tarantool-c-tests/lj-549-lua-load.test.c
  create mode 100644 test/tarantool-tests/lj-549-bytecode-loader.test.lua
  create mode 100644 test/tarantool-tests/lj-549-bytecode-loader/CMakeLists.txt
  create mode 100644 test/tarantool-tests/lj-549-bytecode-loader/script.lua
 
 --
 2.34.1
 

 

--
Best regards,
IM