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 311146F156; Wed, 10 Aug 2022 17:42:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 311146F156 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1660142544; bh=A9nGbJ3hrnxdBhOcKKOc4nYJVjx5nNcrAhpGPuabmrA=; 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=dIl121QlOWMeeacjfMnknfvMZboiw4RC7z4F7UjvNbxGo/dW6B9o8LzVy4CFEroeS zPW8vqJuzslHrmdVffsscMgE1K1HKzW6imslkaq/d96L3y18I/D0lRjIEYH1Xg6lgy 0oNp1xigQJXz3ba4T/psQhkK7hrZSPPztvFBN7bs= Received: from smtpng1.i.mail.ru (smtpng1.i.mail.ru [94.100.181.251]) (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 24B8E6F156 for ; Wed, 10 Aug 2022 17:42:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 24B8E6F156 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1oLmub-0007c6-37; Wed, 10 Aug 2022 17:42:21 +0300 Date: Wed, 10 Aug 2022 17:32:29 +0300 To: Sergey Kaplun Message-ID: References: <20220713095349.31718-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20220713095349.31718-1-skaplun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD999D8F08CF16C6CA78D09263051051FAE9D7E868F1A8F721C00894C459B0CD1B9966C854882AF145CBFB2C64FE00786CF1CF4F9F754251ADD6BC431959DD8AF3A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378BCFB34D7DDF138E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F1830A860EA0681269DE128AD62FA697117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E17F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FF04B652EEC242312D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B67393CE827C55B5F775ECD9A6C639B01B4E70A05D1297E1BBCB5012B2E24CD356 X-C1DE0DAB: 9604B64F49C60606AD91A466A1DEF99B296C473AB1E142185AC9E3593CE4B31AB1881A6453793CE9274300E5CE05BD4401A9E91200F654B06604ACF793451CC5F34D038AF326B0D62C98D29952B4ACA768BDCA7E5D7DAB0E9C2B6934AE262D3EE7EAB7254005DCED8DA55E71E02F9FC08E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D349DAEDEF7DE8FDCFAAC9AEA9C3DB5C1BDD570913F7FB385693354BBB55C680FE030159C117C2438761D7E09C32AA3244C9003A1E30BC05E07D3CDBFBFBEBD0BFBF94338140B71B8EE927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj7QltIE4ci8LmLRwGI9TE5A== X-Mailru-Sender: 689FA8AB762F7393CC2E0F076E87284E4A3BDAE9D799C985EF6FFED0C57637FAA7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E3365FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] LJ_GC64: Fix IR_VARG offset for fixed number of results. 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: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, I've checked the patch into all long-term branches in tarantool/luajit and bumped a new version in master, 2.10 and 1.10. On 13.07.22, Sergey Kaplun wrote: > From: Mike Pall > > Reported by George Vaintrub. Fixed by Sergey Kaplun. > > (cherry picked from commit 6bda30d8c745b3963ba870221b9be6acdffed9b1) > > This bug occurs when recording `BC_VARG` with the following conditions: > 1) varargs undefined on trace. > 2) known fixed number of results. > > For this case the vararg slots loads via `IR_VLOAD` by offset from > vararg base. In GC64 mode this offset was miscounting due to missing > `LJ_FR2` correction in the base TRef calculation. As the result the > wrong (+1) vararg slot is used. > > This patch adds the missing the aforementioned `LJ_FR2` correction. > > Sergey Kaplun: > * added the description and the test for the problem > > Resolves tarantool/tarantool#7172 > Part of tarantool/tarantool#7230 > --- > > Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-864-varg-rec-base-offset-full-ci > Issues: > * https://github.com/tarantool/tarantool/issues/7172 > * https://github.com/LuaJIT/LuaJIT/issues/864 > > src/lj_record.c | 2 +- > .../lj-864-varg-rec-base-offset.test.lua | 25 +++++++++++++++++++ > 2 files changed, 26 insertions(+), 1 deletion(-) > create mode 100644 test/tarantool-tests/lj-864-varg-rec-base-offset.test.lua > > -- > 2.34.1 > -- Best regards, IM