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 AA3161C02304; Sat, 28 Mar 2026 18:30:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org AA3161C02304 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1774711852; bh=HjmkPtroce7JkZTaM92u02YdeDlyzhUS1cbRzdNPIMg=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ZANWyrrKy4Rp29HqPmLq35CP2+RR944U31DoreLjcy8V2rVk+S18WL68zuOIPyPYj AAiZAzgMqTTE+IJoTyrS4l3i6sJuBC7JRjRt6hoNM87Hcec15WwRq79AP9NiON3fFS APfVTvwoBcXd80TK+0C4iRoPKySOX12Zel5efDM0= Received: from send279.i.mail.ru (send279.i.mail.ru [95.163.59.118]) (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 C2ABD1BFBCFF for ; Sat, 28 Mar 2026 18:30:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C2ABD1BFBCFF Received: by exim-smtp-74865f89dd-lrz4t with esmtpa (envelope-from ) id 1w6VcD-000000005vZ-39mW; Sat, 28 Mar 2026 18:30:22 +0300 To: Sergey Bronnikov Date: Sat, 28 Mar 2026 18:31:17 +0300 Message-ID: <97ef9d8e0cbd59df6ef18a57dd44554f44c12129.1774711616.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9BB347BE606964F7A08BD4DDDC91FFFAA2A8A1AD19D1BD35D182A05F538085040E580431CF02B77123DE06ABAFEAF670542E29968F33F8A4357929136F3D1B804E47927CA7C9EF7A9 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7BC08626EA5717D14EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566CA77254C2DD3B9F64EA6CB1C151A6B494FCE48C2ED098E0188F6F0A36F63C7B3389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A29E2F051442AF778941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B636DA1BED736F9328CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C22494705F91287EA2BDB76E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8BA1EEF9386886340E3AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E7356C9A9530EBF72002C4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5A5DAA94770FFB43A5002B1117B3ED69617ADAD5B061E06CB1A1B8FE1FED62FE8823CB91A9FED034534781492E4B8EEAD6804EF05EF4ADF2AF36E2E0160E5C55395B8A2A0B6518DF68C46860778A80D54AF47762AB4810619 X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D659F7DAFCEFA87B0483D5F63547BCC191C7C9099736CD9C88D6D598C42F159A85EC82C3381B68AA1F3BB8341EE9D5BE9A0AA2B982254DBC66AAFA783C59FA997DA7F8C3F0B4249EB1EF6536EB022892E5344C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVdx/hWl0/CTmhs0HtP2FuX0= X-Mailru-Sender: 583F1D7ACE8F49BDD951BA70C165859E99A69D4F5492705DF33F69C7E48EA1FB04CCE411C3EC2C05F0FF1E59F279F262F2400F607609286E924004A7DEC283833C7120B22964430C52B393F8C72A41A84198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: [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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Mike Pall Reported by Sergey Kaplun. (cherry picked from commit fbb36bb6bfa88716a47c58bcf9ce9f2ef752abac) After the previous commit, the VM handler for the 'errfin' VM event works incorrectly. The error object is taken not from the stack on which the VM handler is invoked. Hence, it breaks the non-VM stack and returns an incorrect error message. This patch fixes the issue by copying the object from the corresponding Lua stack. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#12134 --- src/lj_gc.c | 6 +++-- .../lj-1445-errfin-errmsg.test.lua | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 test/tarantool-tests/lj-1445-errfin-errmsg.test.lua diff --git a/src/lj_gc.c b/src/lj_gc.c index 83ad9ee9..7e4f0a47 100644 --- a/src/lj_gc.c +++ b/src/lj_gc.c @@ -519,10 +519,12 @@ static void gc_call_finalizer(global_State *g, lua_State *L, if (LJ_HASPROFILE && (oldh & HOOK_PROFILE)) lj_dispatch_update(g); g->gc.threshold = oldt; /* Restore GC threshold. */ if (errcode) { + TValue tmp; + copyTV(VL, &tmp, VL->top-1); + VL->top--; lj_vmevent_send(g, ERRFIN, - copyTV(V, V->top++, L->top-1); + copyTV(V, V->top++, &tmp); ); - L->top--; } } 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') + +test:plan(2) + +local EXPECTED_ERR = 'expected err' +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 +collectgarbage() + +test:ok(match_err, 'correct error message in errfin handler') +test:ok(match_line, 'correct source line in errfin handler') + +test:done(true) -- 2.53.0