From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Sergey Bronnikov <sergeyb@tarantool.org> Cc: Sergey Bronnikov <estetus@gmail.com>, tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH luajit] Fix compilation of getmetatable() for UDTYPE_IO_FILE Date: Tue, 10 Dec 2024 12:32:28 +0300 [thread overview] Message-ID: <Z1gKrIGcjQlD-wJX@root> (raw) In-Reply-To: <19c0c442-68a9-4181-8424-7d3e202289f9@tarantool.org> Hi, Sergey! Thanks for the fixes! LGTM, after fixing a bunch of comments below. > diff --git a/test/tarantool-tests/lj-1279-incorrect-recording-getmetatable.test.lua b/test/tarantool-tests/lj-1279-incorrect-recording-getmetatable.test.lua > new file mode 100644 > index 00000000..dc01307e > --- /dev/null > +++ b/test/tarantool-tests/lj-1279-incorrect-recording-getmetatable.test.lua > @@ -0,0 +1,74 @@ > +local tap = require('tap') > +-- A test file to demonstrate an incorrect recording of > +-- `getmetatable()` for I/O handlers. > +-- https://github.com/LuaJIT/LuaJIT/issues/1279 > +local test = tap.test('lj-1279-incorrect-recording-getmetatable'):skipcond({ > + ['Test requires JIT enabled'] = not jit.status(), > +}) > + > +test:plan(6) > + > +jit.opt.start('hotloop=1') > + > +local ud_io_file = io.stdout > +local getmetatable = getmetatable > + > +local function rec_getmetatable(obj) > + local res > + for _ = 1, 4 do > + res = getmetatable(obj) > + end > + return res > +end > + > +-- The testcase to demonstrate a problem by comparing metatable Typo: s/metatable/the metatable/ > +-- returned by two versions of `getmetatable()`: compiled and not. > + > +local mt_orig = debug.getmetatable(ud_io_file) > +assert(type(mt_orig) == 'table') > + > +local mt_rec = {} > +for i = 1, 4 do > + mt_rec[i] = getmetatable(ud_io_file) > +end > +mt_rec[5] = mt_orig > + > +test:ok(true, 'getmetatable() recording is correct') > +test:samevalues(mt_rec, 'metatables are the same') > + > +-- Restore metatable. > +debug.setmetatable(ud_io_file, mt_orig) > +assert(type(mt_orig) == 'table') This restoring is excess since we don't change the metatable yet. > + > +-- The testcase to demonstrate a problem by setting metatable for Typo: s/metatable/the metatable/ > +-- `io.stdout` to a string. > + > +-- Compile `getmetatable()`, it is expected metatable has > +-- a `table` type. > +rec_getmetatable(ud_io_file) > +-- Set a custom metatable to a string. Minor: I would rephrase this like the following: | Set IO metatable to a string. "Custom" isn't clear for me. > +local mt = 'IO metatable' > +getmetatable(ud_io_file).__metatable = mt > +test:is(getmetatable(ud_io_file), mt, 'getmetatable() is correct') > +test:is(rec_getmetatable(ud_io_file), mt, 'compiled getmetatable() is correct') > + > +-- Restore metatable. > +debug.setmetatable(ud_io_file, mt_orig) > +assert(type(mt_orig) == 'table') It is better also to restore the JIT state here, ie. call `jit.flush()` and reset hotcounters via `jit.opt.start('hotloop=1')` to be in sync with the code (we want to compile a trace again). > + > +-- The testcase to demonstrate a problem by removing metatable for Typo: s/metatable/the metatable/ > +-- `io.stdout` and calling garbage collector. Typo: s/garbage collector/the garbage collector/ > + > +-- Compile `getmetatable()`, it is expected metatable has > +-- a `table` type. > +rec_getmetatable(ud_io_file) > +-- Delete metatable. > +debug.setmetatable(ud_io_file, nil) > +collectgarbage() > +test:is(getmetatable(ud_io_file), nil, 'getmetatable() is correct') > +test:is(rec_getmetatable(ud_io_file), nil, 'compiled getmetatable() is correct') > + > +-- Restore metatable. > +debug.setmetatable(ud_io_file, mt_orig) > + > +test:done(true) On 22.11.24, Sergey Bronnikov wrote: > Hi, Sergey, > > please see below. > > Updated version has been force-pushed. > > Sergey > <snipped> > >> > > [1]:https://github.com/LuaJIT/LuaJIT/issues/1279#issuecomment-2382392847 > > -- Best regards, Sergey Kaplun
next prev parent reply other threads:[~2024-12-10 9:33 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-11-07 10:51 Sergey Bronnikov via Tarantool-patches 2024-11-07 14:37 ` Sergey Bronnikov via Tarantool-patches 2024-11-12 19:23 ` Sergey Kaplun via Tarantool-patches 2024-11-22 12:53 ` Sergey Bronnikov via Tarantool-patches 2024-12-10 9:32 ` Sergey Kaplun via Tarantool-patches [this message] 2024-12-11 13:58 ` Sergey Bronnikov via Tarantool-patches 2024-12-11 15:54 ` Maxim Kokryashkin 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=Z1gKrIGcjQlD-wJX@root \ --to=tarantool-patches@dev.tarantool.org \ --cc=estetus@gmail.com \ --cc=sergeyb@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit] Fix compilation of getmetatable() for UDTYPE_IO_FILE' \ /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