From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Kaplun <skaplun@tarantool.org> Cc: Maksim Kokryashkin <max.kokryashkin@gmail.com>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit v3 2/2] Fix snapshot PC when linking to BC_JLOOP that was a BC_RET*. Date: Thu, 12 Oct 2023 15:35:52 +0300 [thread overview] Message-ID: <4z2feqjwwe7jlropbjka5a7es6zih5qnon7row7kll36nffmn3@lcm6l6u5vuyh> (raw) In-Reply-To: <ZSUH7DNjNdFrF5JU@root> 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 <mike> > > > > <snipped> > > > diff --git a/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua b/test/tarantool-tests/lj-624-jloop-snapshot-pc.test.lua > > <snipped> > > > +-- > > +-- ---- 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
next prev parent reply other threads:[~2023-10-12 12:35 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-10-04 12:50 [Tarantool-patches] [PATCH luajit v3 0/2] " Maksim Kokryashkin via Tarantool-patches 2023-10-04 12:50 ` [Tarantool-patches] [PATCH luajit v3 1/2] snap: check J->pc is within its proto bytecode Maksim Kokryashkin via Tarantool-patches 2023-10-10 8:05 ` Sergey Kaplun via Tarantool-patches 2023-11-26 15:12 ` Sergey Bronnikov via Tarantool-patches 2023-10-04 12:50 ` [Tarantool-patches] [PATCH luajit v3 2/2] Fix snapshot PC when linking to BC_JLOOP that was a BC_RET* Maksim Kokryashkin via Tarantool-patches 2023-10-10 8:14 ` Sergey Kaplun via Tarantool-patches 2023-10-12 12:35 ` Maxim Kokryashkin via Tarantool-patches [this message] 2023-11-26 15:14 ` Sergey Bronnikov via Tarantool-patches 2024-01-10 8:52 ` [Tarantool-patches] [PATCH luajit v3 0/2] " Igor Munkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4z2feqjwwe7jlropbjka5a7es6zih5qnon7row7kll36nffmn3@lcm6l6u5vuyh \ --to=tarantool-patches@dev.tarantool.org \ --cc=m.kokryashkin@tarantool.org \ --cc=max.kokryashkin@gmail.com \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v3 2/2] Fix snapshot PC when linking to BC_JLOOP that was a BC_RET*.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox