From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 391ED6EC40; Fri, 4 Jun 2021 14:01:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 391ED6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1622804462; bh=mD21XRh1NVDQJC8uqt9n3PTH8fTJCRk6ILaRnk/grBw=; h=In-Reply-To:Date:References:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=B1DjEBe6eiWXZ8WSrZkcOsWY760jxK1sGfzhCFZacNDaLmj2FlCziSiKk4lkDiLe/ DPcZmRBRxvgGMhcfD/wqwNs/Tm06mn29VVmEZ89IOGXh5nbj7V/CZRLpvKAf+K0kQF SLFomsBsIJBkMA5n4paUY2Of/etpRBuoNrFteR8Y= Received: from smtp41.i.mail.ru (smtp41.i.mail.ru [94.100.177.101]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D43206EC40 for ; Fri, 4 Jun 2021 14:01:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D43206EC40 Received: by smtp41.i.mail.ru with esmtpa (envelope-from ) id 1lp7ZT-0006gg-PN; Fri, 04 Jun 2021 14:01:00 +0300 Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) In-Reply-To: <20210602155958.16322-1-skaplun@tarantool.org> Date: Fri, 4 Jun 2021 14:00:59 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20210602155958.16322-1-skaplun@tarantool.org> To: Sergey Kaplun X-Mailer: Apple Mail (2.3654.60.0.2.21) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9D5B0DA836B685C540E30C2BDD69416C6E46C178CD572CB10182A05F538085040F2D7A5EF4F3EF89097613236577C17BA02C863834711A36F05125E322ED0AA15 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7370F4F695FFFC24BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063748789019239639CB8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D88AF7DE3E3AE89DF54690D2075FF19C7A117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC8C7ADC89C2F0B2A5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18F04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE4B6963042765DA4B4DB3626BA78294CCD8FC6C240DEA7642DBF02ECDB25306B2B78CF848AE20165D0A6AB1C7CE11FEE3A7DFDF579AB090EF2D242C3BD2E3F4C6C4224003CC836476EA7A3FFF5B025636E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F79006371F24DFF1B2961425731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5F83CE2C25AEC5D8555B456D1CC4F144FEEF2968CB4BCD4CBD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75FBC5FED0552DA851410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34CAFBC0A7A4BEEE01A51953D79DE6050BF964E7598FBAC60324C208210DE830F0BE891F8602A53DDE1D7E09C32AA3244C36B3BC457A923FD1BDAEC3A2C8B4620969B6CAE0477E908DFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojz99asgmzejr13UDJA2Hl3A== X-Mailru-Sender: 455D65AE3A139168626D8C76E86D3AC037902A54656C8442B07008ECB7C0F4BEDDAC019A3742A8B676D79013C85012CDC77752E0C033A69E4BBE7EBD99111A499D0AB74157175C036C18EFA0BB12DBB0 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH] build: fix debug flags for LuaJIT assertions X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Sergey Ostanevich via Tarantool-patches Reply-To: Sergey Ostanevich Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the fix! LGTM. Although I can=E2=80=99t 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 wrote: >=20 > 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. >=20 > Follows up #4862 > --- >=20 > Branch: = https://github.com/tarantool/tarantool/tree/skaplun/tarantool-debug-fix >=20 >=20 > 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]. >=20 > [1]: = https://lists.tarantool.org/tarantool-patches/20210211192336.GC9361@root/ >=20 > cmake/luajit.cmake | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > 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" >=20 > # 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() >=20 > --=20 > 2.31.0 >=20