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 353D06ECE3; Tue, 2 Nov 2021 19:08:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 353D06ECE3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1635869332; bh=grTLiVloZKSsHyVIEMa5H2wlGJzsPtIyUZV6LVYtiy8=; 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=Zp1x/N5agTgFxkvmSJC4oyGhhyo7HnUQjR5am6oWCR4ccSf+U/MHHjkpD83xHqR71 2BsCo7OThUIFhJK1+sSNeZzRtU4/3nFIjhqQZN2Z4yj4bxsz8LWTe46SBs5GwBv1UX j9KCZkR7sPgbFaZ6m+RCZTeavH5b9xrbAPxR4xhM= 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 F2C056ECE3 for ; Tue, 2 Nov 2021 19:08:49 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F2C056ECE3 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1mhwLA-0005Bt-V0; Tue, 02 Nov 2021 19:08:49 +0300 Date: Tue, 2 Nov 2021 19:08:44 +0300 To: Sergey Kaplun Message-ID: <20211102160844.GF8831@tarantool.org> References: <20211005102829.30267-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD98893113B6235BE9154FDE3298F0A37FC272DDC0DDA52D3DE182A05F5380850408A21685AFD08E614A5F5502FCCC974F7045F5AEE833D6B9AD0745CD335E62227 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BF6699A3AA9BACA6EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F78F3D6E0D6791938638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8A78C0812BD4A627720C420684D3DD30E117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCAA867293B0326636D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8BAA867293B0326636D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B642416645EBD45DC2089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5BB0584559869358E896F30310660928E2B11D13AF4F60546D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA752DA3D96DA0CEF5C48E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34980A6B448CFD1B8AC3BEDA247D83F82FA1C0B81C8E0491421BBB5201BA0F3F5DB2EB63C28A97E8CF1D7E09C32AA3244CDEE93F49E4842135AEEAB2FA89279305B038C9161EF167A1927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojyQYxHpRvLO7o0v9MCGL4pQ== X-Mailru-Sender: 689FA8AB762F7393C37E3C1AEC41BA5DE2B5510FC52D6BC3A7F1C6E628C1A2F0A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for the patch! Please, consider my comments below. On 08.10.21, Sergey Kaplun wrote: > Hi, Sergos! > > Thanks for the review! > > > The new commit message is the following: > > | Fix frame traversal for __gc handler frames. > | > | Reported by Changochen. > | > | (cherry picked from 53f82e6e2e858a0a62fd1a2ff47e9866693382e6) > | > | A cframe unwinding is missed for a C protected frame during a search for > | an error function to handle a runtime error. 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). > | > | This patch adds missing unwinding for CP frame. > | > | Sergey Kaplun: > | * added the description and the test for the problem > > Branch is force-pushed. > > > > > > > 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-finderrfunc > > > LuaJIT issue: https://github.com/LuaJIT/LuaJIT/issues/601 > > > > > > 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 > > > > > > 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 ’tarantool’ branch > > > > s-ostanevich:luajit s.ostanevich$ git checkout tarantool > > Switched to branch 'tarantool' > > s-ostanevich:luajit s.ostanevich$ git clean -xdff > > […] > > s-ostanevich:luajit s.ostanevich$ cmake . > > […] > > s-ostanevich:luajit s.ostanevich$ make > > […] > > [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 > > TAP version 13 > > 1..1 > > ok - successfully collectgarbage with error > > Wild guess: it doesn't fail on Mac due to GC64 ;). > See CI [1] to check my hypothesis. Is it possible to fix the test chunk making it check the error even with GC64 enabled? > > > > > > @@ -0,0 +1,25 @@ > > > +local tap = require('tap') > > > + > > > +local test = 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 = newproxy(true) > > > +getmetatable(a).__gc = function() > > > + -- Function to raise error via `lj_err_run()` inside __gc. What does exactly raise an error in this function? > > > + local _ = 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. Why do you even need this loop? Why can't you just assign nil to ? > > > +for _ = 1, 4 do newproxy(a) end > > > +collectgarbage('collect') > > > + > > > +test:ok(true, 'successfully collectgarbage with error') Minor: I propose to reword the following way: | error in __gc is successfully handled > > > +os.exit(test:check() and 0 or 1) > > > -- > > > 2.31.0 > > > > > > > [1]: https://github.com/tarantool/tarantool/tree/skaplun/gh-noticket-fix-gc-finderrfunc-no-fix > > -- > Best regards, > Sergey Kaplun -- Best regards, IM