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 B0E7AA5A5D9; Thu, 15 Feb 2024 17:00:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B0E7AA5A5D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1708005656; bh=0Rg57JwNzAemh0eKzXEGjlCdaiRllYeJiPPKKp9NuVM=; 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=G4Py8temd0NVCUYXChf7YPTkw5gQw/ZTAkBJ3YHgxVSERHhFVfJLobI/bxvuBBkmr j0nE+HMXQQs74N8O/KOtKVPM/p7FK6TKkqcRGRjq+J/csLINdkL43/SPuzlUlFTjjL zLpf+M17kMO0S762dAKWScnRUpkVR0E8/EU2/HxQ= Received: from smtp55.i.mail.ru (smtp55.i.mail.ru [95.163.41.93]) (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 D852BA5A5D9 for ; Thu, 15 Feb 2024 17:00:48 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D852BA5A5D9 Received: by smtp55.i.mail.ru with esmtpa (envelope-from ) id 1racIB-0000000GEat-3O1J; Thu, 15 Feb 2024 17:00:48 +0300 Date: Thu, 15 Feb 2024 13:49:21 +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: 78E4E2B564C1792B X-77F55803: 4F1203BC0FB41BD9001F8F2F6BAD2021FFAB9DE81764C590E5F67E848AD4FF6D00894C459B0CD1B9AEFE65F38896A012063DFE54A44055BFCA53BEF0C645966A63B764629CC13828CE06B70447BA4CE8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D9C4478D0B876341EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063781BF90BB6B3E56078638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D815F78F29E0CE9ED8E251B32FA4DFC63483BE78D25C1A6807CC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC81D471462564A2E19F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CF8BD4E506CFA3D8803F1AB874ED890284AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C325C33BDE98D8A053BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C321259270BBF67A2035872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5758D7E02D18C09765002B1117B3ED69610062BD0CA1B6A6372305013E4AE841E823CB91A9FED034534781492E4B8EEADAEB4DDBFD72C8FA1BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742D3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF57D1CA45597CC4F003C415BBD8DFF42DB0BA31FD61210B8C9C69AA1BCC63C22A498A0925D89034503168784816B25684E86F30752A316FAA6197F50487CA12C521783C38D764EE3577C8E16086367389913E6812662D5F2A74A26541E23E71317A83BD0C44CE203720ABEDE4BBDD9CDD X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQ9gr3ZFpXEmu7Mn8a9hTtQ== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D53153D4D49649A13BCEBCF21BD12D43251CF21DF14144B8B903C1EC28D4A62288D0F5EE5212A79745119D086FC03DADA47A24EDF3BD9585A06DEEABBE9EE6587A054198E0F3ECE9B5443453F38A29522196 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, I've checked the patchset into all long-term branches in tarantool/luajit and bumped a new version in master, release/3.0 and release/2.11. 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