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 5B760A1D11D; Thu, 8 Feb 2024 19:02:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5B760A1D11D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1707408162; bh=TipMMR4qe+0QkwedArpAiLNxbZRTBFZJhx+9oD3k8og=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=UhQ6voE68GiJKFDjx+AXDElHClo7kI8ktSCm9mHBWLDdgmWDhFPdty1LfN8Sm0rs6 dhn2ms8gP0V8OY6nzeaevMEZnrWYk7hVhiZXyRlsYa+RALEnTvJF3lhu9hWsH9Q7UL 4fM/Tnr23prfvxO7XYCH/j3tp0xXHfZk47ixySC0= Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [95.163.41.66]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id D264BA1D100 for ; Thu, 8 Feb 2024 19:02:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D264BA1D100 Received: by smtp43.i.mail.ru with esmtpa (envelope-from ) id 1rY6rI-000000040hT-0cME; Thu, 08 Feb 2024 19:02:40 +0300 Date: Thu, 8 Feb 2024 15:52:14 +0000 To: Sergey Bronnikov Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD91FEFD63CE1B099161FAD7000A93F75AB762A6AB01F52C15500894C459B0CD1B9FB9157804A68F40B1DC494AC9F4AA34676CB2CAB041056D90BE64B003B9A1E84A5D819213F947FA3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE72F22E6DC541F75D9EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006379B0255B5E5688AF88638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D899AADE0DCEF4A567D8BBDC5359B4FBF7A9747670DD50F293CC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC82FFDA4F57982C5F4F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C4CB6874B0BCFF0B8302FCEF25BFAB3454AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3642883364D384F09BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3D703628AB378667775ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 0D63561A33F958A53333E8703066E2805002B1117B3ED696EFD9F511877FEB46E772F934B9BCD185823CB91A9FED034534781492E4B8EEAD831CA35E4C50C31B X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742D3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFF49ED244C2E16621ED148972BDF36B7F619877025864FE6296C47CD799265C6FA5CD7B9A90500322766A7423F6D95CBE68B4B5F41CFFE6718A16B0DBE2AF6F546AAB78AA6CC1D46D77C8E16086367389913E6812662D5F2A74A26541E23E71317A83BD0C44CE203720ABEDE4BBDD9CDD X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojt6itc0777Zpclj0QNLKljw== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D5317659A372309B894081508210FEB0A3EAC6E050942116ABD7215F1259EC4901A4F5EE5212A79745119D086FC03DADA47A24EDF3BD9585A06DEEABBE9EE6587A054198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 0/2][v3] Fix embedded bytecode loader 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: max.kokryashkin@gmail.com, tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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 > > 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