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 7086E6EC55; Thu, 7 Oct 2021 19:31:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7086E6EC55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1633624288; bh=96neAhnn8m0V7hmVHXSqotnk7BGQxxgQJAw9cC6BN30=; h=In-Reply-To:Date:References:To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=fIS2aVivD1D7IO4plYr9Z5UoXTtjT3gW8ciUzYFpRTEcMJHQ6fEJPKlpinIubti9s NJsrc48WOQiNp1cRgT6t+QjBgXyg59VuSbY/FqG2LmkW2e/HWO7SJQH5RrrtYnX3U3 vFGnf5rPudDBaCRyAWKQ8HwTnYTehlTPPKQ3kgHM= 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 D97416EC55 for ; Thu, 7 Oct 2021 19:31:26 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D97416EC55 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mYWIn-0007uQ-Pk; Thu, 07 Oct 2021 19:31:26 +0300 Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) In-Reply-To: <20211005102829.30267-1-skaplun@tarantool.org> Date: Thu, 7 Oct 2021 19:31:24 +0300 Content-Transfer-Encoding: quoted-printable Message-Id: References: <20211005102829.30267-1-skaplun@tarantool.org> To: Sergey Kaplun X-Mailer: Apple Mail (2.3654.120.0.1.13) X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9A6D4E3B1981C4C7DAD43454600594039D7A65BDC564FF242182A05F5380850405F41384DD5B8642FF6D042E9A798BF4B395F898E584E3281001E98CA2C7BBE59 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BA0D57D3459E5640EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F10F1F3256FD32E28638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8E14D15E496892AAC79AFABAB46A4D84A117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B62819857A95C66D5F089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5937C3DAEFDB9B0C5DB754F603DEEB6B423E4B1B021B705B1D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA759D2A03B9C34326B3410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34060C3C6DE316ECE477F60E889D63DCDA31C4AB03ADDADA92B9F7A2CAAA70E1C4CA497655034685781D7E09C32AA3244CA1BC6B7DFCEE17723E956577E0A3053B259227199D06760AFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbhzlKa2eIcUU8z3aBVxxCQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5D067AA75EE2F59E49D2172C787BDEEF65D86460CE94ACC410B98B9A657DE05FA7FB559BB5D741EB96F714CF339B3F4B0DA5517EFC3E06706F67EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] Fix frame traversal for __gc handler frames. 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: sergos via Tarantool-patches Reply-To: sergos Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thanks for the patch! See my 2 comments below. Sergos > On 5 Oct 2021, at 13:28, Sergey Kaplun wrote: >=20 > From: Mike Pall >=20 > Reported by Changochen. >=20 > (cherry picked from 53f82e6e2e858a0a62fd1a2ff47e9866693382e6) >=20 > Additional stack traversal is needed to find an error function set for ^^^ ^^^ Additional to what? =20 =09 > handling runtime errors. cframe unwinding is missed for a C protected > frame during this stack traversal. I would rephrase -=20 A cframe unwinding is miseed for a C protected frame during a serach for=20= an error function to handle a runtime error.=20 > It leads to undefined behaviour or > crash, when raising a runtime error on stack with the CP frame before = an > error function handler (for example, an error in __gc handler). >=20 > This patch adds missing unwinding for CP frame. >=20 > Sergey Kaplun: > * added the description and the test for the problem > --- >=20 > Branch: = https://github.com/tarantool/luajit/tree/skaplun/lj-601-fix-gc-finderrfunc= > Tarantool branch: = https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-fix-gc-fin= derrfunc > LuaJIT issue: https://github.com/LuaJIT/LuaJIT/issues/601 >=20 > src/lj_err.c | 1 + > .../lj-601-fix-gc-finderrfunc.test.lua | 25 +++++++++++++++++++ > 2 files changed, 26 insertions(+) > create mode 100644 = test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua >=20 > diff --git a/src/lj_err.c b/src/lj_err.c > index b6be357e..b520b3d3 100644 > --- a/src/lj_err.c > +++ b/src/lj_err.c > @@ -585,6 +585,7 @@ static ptrdiff_t finderrfunc(lua_State *L) > if (cframe_canyield(cf)) return 0; > if (cframe_errfunc(cf) >=3D 0) > return cframe_errfunc(cf); > + cf =3D cframe_prev(cf); > frame =3D frame_prevd(frame); > break; > case FRAME_PCALL: > diff --git a/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua = b/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua > new file mode 100644 > index 00000000..d8d79100 > --- /dev/null > +++ b/test/tarantool-tests/lj-601-fix-gc-finderrfunc.test.lua Unfortunately the test passes on the =E2=80=99tarantool=E2=80=99 branch=20= s-ostanevich:luajit s.ostanevich$ git checkout tarantool Switched to branch 'tarantool' s-ostanevich:luajit s.ostanevich$ git clean -xdff [=E2=80=A6] s-ostanevich:luajit s.ostanevich$ cmake . [=E2=80=A6] s-ostanevich:luajit s.ostanevich$ make [=E2=80=A6] [100%] Built target libluajit_shared [100%] Built target libluajit [100%] Built target luajit s-ostanevich:luajit s.ostanevich$ git checkout = skaplun/lj-601-fix-gc-finderrfunc s-ostanevich:luajit s.ostanevich$ cd test/tarantool-tests s-ostanevich:tarantool-tests s.ostanevich$ ../../src/luajit = lj-601-fix-gc-finderrfunc.test.lua=20 TAP version 13 1..1 ok - successfully collectgarbage with error > @@ -0,0 +1,25 @@ > +local tap =3D require('tap') > + > +local test =3D tap.test('lj-601-fix-gc-finderrfunc') > +test:plan(1) > + > +-- Test file to demonstrate LuaJIT incorrect behaviour, when > +-- throwing error in __gc finalizer. > +-- See also, https://github.com/LuaJIT/LuaJIT/issues/601. > + > +collectgarbage() > + > +local a =3D newproxy(true) > +getmetatable(a).__gc =3D function() > + -- Function to raise error via `lj_err_run()` inside __gc. > + local _ =3D load(function() collectgarbage()() end) > +end > + > +-- XXX: Generate a small bunch of proxies. Need several to call > +-- `collectgarbage()` on another proxy inside __gc. N cycles is > +-- empirical number. > +for _ =3D 1, 4 do newproxy(a) end > +collectgarbage('collect') > + > +test:ok(true, 'successfully collectgarbage with error') > +os.exit(test:check() and 0 or 1) > --=20 > 2.31.0 >=20