[Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Sergey Kaplun via Tarantool-patches]

This patch fixes inaccuracy in Tarantool build configuration introduced
by commit 07c83aa ('build: adjust
LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and
LUA_USE_APICHECK correspondingly. This patch fixes these typos.

Follows up #4862
---

Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix


Also, LUAJIT_USE_ASAN -- is set, but LuaJIT checks for ENABLE_ASAN as
is with corresponding FIXME to implement ASAN correctly. But it
looks like it should be done in a separate patch by enabling all LuaJIT
build flags, see list of options here [1].

[1]: https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/

 cmake/luajit.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake
index 6a94327a7..92cc88e70 100644
--- a/cmake/luajit.cmake
+++ b/cmake/luajit.cmake
@@ -49,9 +49,9 @@ set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua"
 
 # Enable internal LuaJIT assertions for Tarantool Debug build.
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(LUAJIT_USE_APICHECK ON CACHE BOOL
+    set(LUA_USE_APICHECK ON CACHE BOOL
         "Assertions for the Lua/C API" FORCE)
-    set(LUAJIT_USE_ASSERT ON CACHE BOOL
+    set(LUA_USE_ASSERT ON CACHE BOOL
         "Assertions for the whole LuaJIT VM" FORCE)
 endif()
 
-- 
2.31.0

Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Sergey Ostanevich via Tarantool-patches]

Hi!
Thanks for the fix!

LGTM.

Although I can’t figure out how it was tested in 07c83aa. If there were
no tests - the probably more misprints exist?

Sergos


> On 2 Jun 2021, at 18:59, Sergey Kaplun <skaplun@tarantool.org> wrote:
> 
> This patch fixes inaccuracy in Tarantool build configuration introduced
> by commit 07c83aa ('build: adjust
> LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
> LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and
> LUA_USE_APICHECK correspondingly. This patch fixes these typos.
> 
> Follows up #4862
> ---
> 
> Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix
> 
> 
> Also, LUAJIT_USE_ASAN -- is set, but LuaJIT checks for ENABLE_ASAN as
> is with corresponding FIXME to implement ASAN correctly. But it
> looks like it should be done in a separate patch by enabling all LuaJIT
> build flags, see list of options here [1].
> 
> [1]: https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/
> 
> cmake/luajit.cmake | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/cmake/luajit.cmake b/cmake/luajit.cmake
> index 6a94327a7..92cc88e70 100644
> --- a/cmake/luajit.cmake
> +++ b/cmake/luajit.cmake
> @@ -49,9 +49,9 @@ set(LUAJIT_TEST_INIT "${PROJECT_SOURCE_DIR}/test/luajit-test-init.lua"
> 
> # Enable internal LuaJIT assertions for Tarantool Debug build.
> if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> -    set(LUAJIT_USE_APICHECK ON CACHE BOOL
> +    set(LUA_USE_APICHECK ON CACHE BOOL
>         "Assertions for the Lua/C API" FORCE)
> -    set(LUAJIT_USE_ASSERT ON CACHE BOOL
> +    set(LUA_USE_ASSERT ON CACHE BOOL
>         "Assertions for the whole LuaJIT VM" FORCE)
> endif()
> 
> -- 
> 2.31.0
> 

Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Igor Munkin via Tarantool-patches]

Sergey,

Thanks for the patch! Please consider the nits below. Otherwise, LGTM.

On 02.06.21, Sergey Kaplun wrote:
> This patch fixes inaccuracy in Tarantool build configuration introduced
> by commit 07c83aa ('build: adjust

Typo: Please use the full hash.

> LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
> LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and

Typo: s/instead LUA_USE_ASSERT/instead of LUA_USE_ASSERT/.

> LUA_USE_APICHECK correspondingly. This patch fixes these typos.

Minor: s/correspondingly/respectively/.

> 
> Follows up #4862
> ---
> 
> Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix
> 
> 
> Also, LUAJIT_USE_ASAN -- is set, but LuaJIT checks for ENABLE_ASAN as
> is with corresponding FIXME to implement ASAN correctly. But it
> looks like it should be done in a separate patch by enabling all LuaJIT
> build flags, see list of options here [1].

BTW, we have a separate issue for enabling ASAN in LuaJIT[1].

> 
> [1]: https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/
> 
>  cmake/luajit.cmake | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

<snipped>

>  
> -- 
> 2.31.0
> 

[1]: https://github.com/tarantool/tarantool/issues/5878

-- 
Best regards,
IM

Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Sergey Kaplun via Tarantool-patches]

Hi, Igor!

Thanks for the review!

On 10.06.21, Igor Munkin wrote:
> Sergey,
> 
> Thanks for the patch! Please consider the nits below. Otherwise, LGTM.
> 
> On 02.06.21, Sergey Kaplun wrote:
> > This patch fixes inaccuracy in Tarantool build configuration introduced
> > by commit 07c83aa ('build: adjust
> 
> Typo: Please use the full hash.
> 
> > LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
> > LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and
> 
> Typo: s/instead LUA_USE_ASSERT/instead of LUA_USE_ASSERT/.
> 
> > LUA_USE_APICHECK correspondingly. This patch fixes these typos.
> 
> Minor: s/correspondingly/respectively/.

Fixed all suggestions, the new commit message is the following:

===================================================================
build: fix debug flags for LuaJIT assertions

This patch fixes inaccuracy in Tarantool build configuration introduced
by commit 07c83aab5c066ca75c149112b331b4dbb81b3f38 ('build: adjust
LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
LUAJIT_USE_APICHECK options for Debug build instead of LUA_USE_ASSERT
and LUA_USE_APICHECK respectively. This patch fixes these typos.

Follows up #4862
===================================================================

Branch is force-pushed.

> 
> > 
> > Follows up #4862
> > ---
> > 
> > Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix
> > 
> > 
> > Also, LUAJIT_USE_ASAN -- is set, but LuaJIT checks for ENABLE_ASAN as
> > is with corresponding FIXME to implement ASAN correctly. But it
> > looks like it should be done in a separate patch by enabling all LuaJIT
> > build flags, see list of options here [1].
> 
> BTW, we have a separate issue for enabling ASAN in LuaJIT[1].
> 
> > 
> > [1]: https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/
> > 
> >  cmake/luajit.cmake | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> 
> <snipped>
> 
> >  
> > -- 
> > 2.31.0
> > 
> 
> [1]: https://github.com/tarantool/tarantool/issues/5878
> 
> -- 
> Best regards,
> IM

-- 
Best regards,
Sergey Kaplun

Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions

[Igor Munkin via Tarantool-patches]

Sergey,

I've checked the patch into 1.10, 2.7, 2.8 and master.

On 02.06.21, Sergey Kaplun wrote:
> This patch fixes inaccuracy in Tarantool build configuration introduced
> by commit 07c83aa ('build: adjust
> LuaJIT build system'). That patch sets LUAJIT_USE_ASSERT and
> LUAJIT_USE_APICHECK options for Debug build instead LUA_USE_ASSERT and
> LUA_USE_APICHECK correspondingly. This patch fixes these typos.
> 
> Follows up #4862
> ---
> 
> Branch: https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix
> 

<snipped>

>  
> -- 
> 2.31.0
> 

-- 
Best regards,
IM