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 B88A519BDB6A; Wed, 4 Mar 2026 12:48:28 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B88A519BDB6A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1772617708; bh=OTcvSCLiaWyVFOo+KAJf1glDHCO+4h4xHTRfWFLFPvU=; 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=PVu4PAfeIDQV0+X9yugOi/5B9A5HXe8XZf9SpQ6u9I/85LoXVGD0dXO7YCHqL8v06 6YgU3nwqS6hjSfYKr+biUG6mD4u1mD+CMT8N1QNB0uK0B4TUW9I9o02M0Gslx6AhvS BmMJ7JST8P/BMqTkm4/ZtkH/yGEvKRn5H/GaGTlE= Received: from send127.i.mail.ru (send127.i.mail.ru [89.221.237.222]) (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 0D74B19FAA30 for ; Wed, 4 Mar 2026 12:48:27 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 0D74B19FAA30 Received: by exim-smtp-558f87dcd7-m4kvs with esmtpa (envelope-from ) id 1vxiq9-00000000CPY-2e60; Wed, 04 Mar 2026 12:48:26 +0300 Date: Wed, 4 Mar 2026 12:49:14 +0300 To: Sergey Bronnikov Cc: Sergey Bronnikov , tarantool-patches@dev.tarantool.org Message-ID: References: <51e75e7052824de65036abd2f5807a1224f438aa.1765350224.git.sergeyb@tarantool.org> <2c57321f-06c6-4a31-bb69-118a7dd09cce@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2c57321f-06c6-4a31-bb69-118a7dd09cce@tarantool.org> X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD9FE49BA1A5307ACBF0F5BBED206C6FCDF347C87ECC44DA82D00894C459B0CD1B95740067370CCD0BD0578E6996F383413A8F47DDB8C9F2C03756B73623BB0A294A43962510F43F2FA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE766DBE83FD69AB645EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB55337566CF7C7957E47253289729D035C2D118C67FC08DD060A52CE84EA43803A826B84C389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0CB629EEF1311BF91D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B566404C906FA8ADEA471835C12D1D977C4224003CC836476EB9C4185024447017B076A6E789B0E975F5C1EE8F4F765FCFBA309ABC751185B3AA81AA40904B5D9CF19DD082D7633A0C84D3B47A649675F3AA81AA40904B5D98AA50765F79006375E0C4FEECE36C4E6D81D268191BDAD3D3666184CF4C3C14F3FC91FA280E0CE3D1A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89FB26E97DCB74E62525E1C53F199C2BB95B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: 0D63561A33F958A51D2E080636CF6CF15002B1117B3ED696E355693E4EABB6914869453249F34FA4823CB91A9FED034534781492E4B8EEAD0AA277257C6A5E3DBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE191716CD42B3DD1D34CAB70F9BE574AE9C625B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6590ED113F108C573AE757725DDA6DF1A92097BECA28DFEBBB054C644EE160CD2806A09E885117AEF64B8341EE9D5BE9A0AE5E112B412249D80C6D949B8E58405750954885918194CBB6536EB022892E5344C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVbwN8XFWZxQUEa6y+zU9q4Y= X-Mailru-Sender: 520A125C2F17F0B17094CDC02B85F11B192A4886DE5C2C513DE06ABAFEAF67053EBE96B8B2FCB126B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/3][v2] LJ_FR2: Fix stack checks in vararg calls. 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" Sergey, On 16.02.26, Sergey Bronnikov wrote: > Hi, Sergey, > > thanks for review! > > On 2/11/26 11:30, Sergey Kaplun via Tarantool-patches wrote: > > On 10.12.25, Sergey Bronnikov wrote: > >> diff --git a/src/lj_dispatch.c b/src/lj_dispatch.c > >> index a44a5adf..431cb3c2 100644 > >> --- a/src/lj_dispatch.c > >> +++ b/src/lj_dispatch.c > >> @@ -453,7 +453,7 @@ static int call_init(lua_State *L, GCfunc *fn) > >> int numparams = pt->numparams; > >> int gotparams = (int)(L->top - L->base); > >> int need = pt->framesize; > >> - if ((pt->flags & PROTO_VARARG)) need += 1+gotparams; > >> + if ((pt->flags & PROTO_VARARG)) need += 1+LJ_FR2+gotparams; > >> lj_state_checkstack(L, (MSize)need); > >> numparams -= gotparams; > >> return numparams >= 0 ? numparams : 0; > > Let's add an additional test for this part of code (since we don't have > > any). It may be taken from [1]. It doesn't fail now, but we may cover > > this branch more precise. > > Don't get what do you mean. > > true branch in gc32 is covered by the following tests: > > test/LuaJIT-tests > test/PUC-Rio-Lua-5.1-tests > test/tarantool-c-tests/lj-1087-vm-handler-call.c_test > test/tarantool-tests/fix-ff-select-recording.test.lua > test/tarantool-tests/fix-mips64-spare-side-exit-patching.test.lua > test/tarantool-tests/fix-slot-check-for-mm-record.test.lua > test/tarantool-tests/fix-slots-overflow-for-varg-record.test.lua > test/tarantool-tests/gh-6098-fix-side-exit-patching-on-arm64.test.lua > test/tarantool-tests/lj-1024-varg-maxslot.test.lua > test/tarantool-tests/lj-1025-tsetm-maxslot.test.lua > test/tarantool-tests/lj-1026-arm64-invalid-hrefk-offset-check.test.lua > test/tarantool-tests/lj-1046-fix-bc-varg-recording.test.lua > test/tarantool-tests/lj-1164-record-meta-concat-varg-pcall.test.lua > test/tarantool-tests/lj-1295-bad-renames-for-sunk-values.test.lua > test/tarantool-tests/lj-584-bad-renames-for-sunk-values.test.lua > test/tarantool-tests/lj-704-bc-varg-use-def.test.lua Just the true branch isn't enough. We need the true branch when the stack needs to be reallocated, like in the [1]. When I check this issue (with 1 removed) none of our tests catches the incorrect behaviour. You may refer to the test like lj-1402-vararg-realloc-check.test.lua. The comment in the test should clarify that this is to avoid regressions in the future. > > [1]:https://github.com/LuaJIT/LuaJIT/issues/1402#issue-3569942423 > > -- Best regards, Sergey Kaplun