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 080C7165DDFC; Mon, 30 Mar 2026 12:44:03 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 080C7165DDFC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1774863843; bh=aZ6zQbXLFiLnwmvUY0yuTXDlJT3DUZtfnqjY59slWL4=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=KFs5MDF5a9IiIyglumhe441NXeQdY+EeKBCNAumnRCDmKc72uBTnUF3keEeHGP5sF 0vJnQuw1JcCOwVOKgAgLKv6tzph8NZFaLjhZyfff/zEHEsvToStWb2RUkzRcbtymrf z/zzq6ELrInSDjJGlBfoEQB+fxawyuJ9CZD5VOOo= Received: from send175.i.mail.ru (send175.i.mail.ru [95.163.59.14]) (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 16A96165DDF7 for ; Mon, 30 Mar 2026 12:44:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 16A96165DDF7 Received: by exim-smtp-74865f89dd-54cq6 with esmtpa (envelope-from ) id 1w79A9-000000000i1-0E5L; Mon, 30 Mar 2026 12:44:01 +0300 Date: Mon, 30 Mar 2026 12:44:58 +0300 To: Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org Message-ID: References: <97ef9d8e0cbd59df6ef18a57dd44554f44c12129.1774711616.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9BB347BE606964F7A7A9624191B0986B48062D88EEAA2900B182A05F5380850406273EA09852F75F23DE06ABAFEAF670532C5BB3DDB2ACDCED477F7E85AEB654277626B0F71EFE3B5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE727FD6E7FC3A8F857EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566B07F865632A7258418AD279FF8FED5B0DD453341DACF0D093B2072B077BFD6FF389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A3E989B1926288338941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B652D31B9D28593E51CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C22496E72AA9E7D514E7076E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B998C1B47ABA640FE3AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E7358CCB3ED2A1DE2304C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5B1DA54598032266A5002B1117B3ED6969A2C9773773613C7A9DAB4B68AE4D22F823CB91A9FED034534781492E4B8EEAD0AA277257C6A5E3DBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659F0F2CC9327CE8C56E58884986E9EBB06097E2B7BED3DB5C6F3651F0361133C9F3EF2AD7F08FB620DB8341EE9D5BE9A0AE910189861373DBC327C78FFEC1D679ECCA334ED163ED3668CD93680B12512CF4C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVdx/hWl0/CTmFeIb5cd7++w= X-Mailru-Sender: 520A125C2F17F0B17094CDC02B85F11B1315FA36FFBFEEDE3DE06ABAFEAF670532C5BB3DDB2ACDCEB7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/2] Fix VM event error handling for finalizers. 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: Sergey Kaplun via Tarantool-patches Reply-To: Sergey Kaplun Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi, Sergey! Thanks for the review! Fixed the comments and force-pushed the branch. On 30.03.26, Sergey Bronnikov wrote: > Hi, Sergey! > > thanks for the patch! LGTM with a couple of comments below > > Sergey > > On 3/28/26 18:31, Sergey Kaplun wrote: > > diff --git a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua > > new file mode 100644 > > index 00000000..def8b79c > > --- /dev/null > > +++ b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua > > @@ -0,0 +1,27 @@ > > +local tap = require('tap') > > +local test = tap.test('lj-1445-errfin-errmsg') > > + > > Usually you add a comment with test description and a link to the issue. > > But this time a comment is absent. Should we add it? Added, thanks! =================================================================== diff --git a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua index 7170065f..a52f6a06 100644 --- a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua +++ b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua @@ -1,4 +1,9 @@ local tap = require('tap') + +-- The test file to demostrate LuaJIT's incorrect invocation of +-- the VM event handler for the 'errfin' VM event. +-- See also: https://github.com/LuaJIT/LuaJIT/issues/1445. + local test = tap.test('lj-1445-errfin-errmsg') test:plan(2) =================================================================== > > > +test:plan(2) > > + > > +local EXPECTED_ERR = 'expected err' > > s/err/error/ Fixed: =================================================================== diff --git a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua index def8b79c..205cd2d0 100644 --- a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua +++ b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua @@ -3,7 +3,7 @@ local test = tap.test('lj-1445-errfin-errmsg') test:plan(2) -local EXPECTED_ERR = 'expected err' +local EXPECTED_ERR = 'expected error' local function bad_fin() error(EXPECTED_ERR) end =================================================================== > > feel free to ignore > > > +local function bad_fin() > > + error(EXPECTED_ERR) > > +end > > +local EXPECTED_LOCATION = debug.getinfo(bad_fin).linedefined + 1 > > + > > +local match_err = false > > +local match_line = false > > +local function errfin_handler(errmsg) > > + match_err =errmsg:match(EXPECTED_ERR) > > + match_line =errmsg:match(EXPECTED_LOCATION) > > +end > > + > > +jit.attach(errfin_handler, 'errfin') > > + > > +debug.getmetatable(newproxy(true)).__gc = bad_fin > > I would define userdata previously for clarity: > > local ud = newproxy(true) > > and then use it in getmetatable(). > > feel free to ignore > Don't want to use `ud = nil`. Added the comment. =================================================================== diff --git a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua index def8b79c..205cd2d0 100644 --- a/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua +++ b/test/tarantool-tests/lj-1445-errfin-errmsg.test.lua @@ -18,6 +18,7 @@ end jit.attach(errfin_handler, 'errfin') +-- Create the userdata with the finalizer and collect it. debug.getmetatable(newproxy(true)).__gc = bad_fin collectgarbage() =================================================================== > > > +collectgarbage() > > + > > +test:ok(match_err, 'correct error message in errfin handler') > > +test:ok(match_line, 'correct source line in errfin handler') > > + > > +test:done(true) -- Best regards, Sergey Kaplun