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 BD819656C30; Thu, 12 Oct 2023 15:35:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org BD819656C30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1697114156; bh=qSHoH59ejg18LQdJqSz738BqT0xF/kKWCCOGgph/ewE=; 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=oiJlk2295Gyj6z/DRxBhz+HCJV6pr9tre072qUvPa+BqNYHMjQAbDim3hegoZqWip bW1nPfb1EcoCh3oiU697kRr6jw3P37TGR2yoL/ybP7ywq0W84Kb7nqQ2fygoxaL13H LKyn6rMiwltE3/A4u38O3eVCmh5E9FY5TMGgWRnU= 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 34F0A656C30 for ; Thu, 12 Oct 2023 15:35:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 34F0A656C30 Received: by smtp55.i.mail.ru with esmtpa (envelope-from ) id 1qquuu-000cao-35; Thu, 12 Oct 2023 15:35:53 +0300 Date: Thu, 12 Oct 2023 15:35:52 +0300 To: Sergey Kaplun Message-ID: <4z2feqjwwe7jlropbjka5a7es6zih5qnon7row7kll36nffmn3@lcm6l6u5vuyh> References: <20231004125034.64110-1-max.kokryashkin@gmail.com> <20231004125034.64110-3-max.kokryashkin@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD975BDE581529CF564DD3E80B5B936126754E0CEFFC7BFA9F0182A05F538085040E0B98B68B6850CFB270709F901195601C68355A37FDEEA2990359ECE1D08C1F2 X-C1DE0DAB: 0D63561A33F958A54C70EF21E46B7B67F3C6BA7D909F6F4E0540E98F460C1F68F87CCE6106E1FC07E67D4AC08A07B9B00A6B3CD6EB70C818BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF77DD89D51EBB7742DC8270968E61249B1004E42C50DC4CA955A7F0CF078B5EC49A30900B95165D34A503FBFE8BE8FC49FF4F3E112D126AECD93263BFBAEC8F68D10EEB1D87C735EACB4755FB389A17E31D7E09C32AA3244CFDDD9EC3E43613F4CF99C0C46A12025E05AB220A9D022EBCBAD658CF5C8AB4025DA084F8E80FEBD396F07DFE06A4A8314E894E437E78228B66933FA05BD8EF0CAD958392AE682691 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojBYtV3BjG6I7cViSmG0CCsg== X-Mailru-Sender: 11C2EC085EDE56FA38FD4C59F7EFE40740D5653414C04D525BA6CE45B09E2D6BA3EAC56F6A374A44D51284F0FE6F529ABC7555A253F5B200DF104D74F62EE79D27EC13EC74F6107F4198E0F3ECE9B5443453F38A29522196 X-Mras: OK Subject: Re: [Tarantool-patches] [PATCH luajit v3 2/2] Fix snapshot PC when linking to BC_JLOOP that was a BC_RET*. 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: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Cc: Maksim Kokryashkin , tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the review! Fixed your comments, the branch is force-pushed. You can find the diff below. On Tue, Oct 10, 2023 at 11:14:36AM +0300, Sergey Kaplun wrote: > Hi, Maksim! > Thanks for the patch! > LGTM, just a few nits regarding to the comments in the test. > > On 04.10.23, Maksim Kokryashkin wrote: > > From: Mike Pall > > > > > > > diff --git a/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua b/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua > > > > > +-- > > +-- ---- TRACE 2 exit 1 > > +-- ---- TRACE 4 start 2/1 test.lua:3 > > +-- 0013 RET1 1 2 > > +-- 0012 ADDVV 1 1 2 > > +-- 0013 JLOOP 3 3 > > +-- > > +-- During the recording of the latter JLOOP the assertion added > > +-- in the patch is triggered. > > Minor: I suggest to rephrase this as the following: > > | The assertion introduced in the previous patch is triggered during > | recording of the last 0013 JLOOP. > > > +-- > > +-- See also: > > +-- https://github.com/luaJIT/LuaJIT/issues/624 > > + > > + > > Nit: extra empty line. Diff with changes: === diff --git a/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua b/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua index 726b2efa..565e4cbf 100644 --- a/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua +++ b/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua @@ -66,13 +66,12 @@ test:plan(1) -- 0012 ADDVV 1 1 2 -- 0013 JLOOP 3 3 -- --- During the recording of the latter JLOOP the assertion added --- in the patch is triggered. +-- The assertion introduced in the previous patch is triggered during +-- recording of the last 0013 JLOOP. -- -- See also: -- https://github.com/luaJIT/LuaJIT/issues/624 - jit.opt.start('hotloop=1', 'hotexit=1') local function fib(n) return n < 2 and n or fib(n - 1) + fib(n - 2) === > > > +jit.opt.start('hotloop=1', 'hotexit=1') > > +local function fib(n) > > + return n < 2 and n or fib(n - 1) + fib(n - 2) > > +end > > + > > +fib(5) > > + > > +test:ok(true, 'snapshot pc is correct') > > +test:done(true) > > -- > > 2.39.3 (Apple Git-145) > > > > -- > Best regards, > Sergey Kaplun