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 EE9CE518639; Mon, 10 Jul 2023 13:52:12 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org EE9CE518639 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1688986333; bh=1e7k2mre1LTTUQVdlV/8j7EEB1xlAx+wtEBJjQ3cCiI=; 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=K5Lv21jpBsmhcm1DhItqnetQjU36pc8s7IQQbf0mdFQyjhu/Qf3E+zsy5UU6d2/1x UgDF8KyeSgGHm+d/FWROkWx/ewTbzx/1+jy7XJzvajLtvRnO8LLCWXx2KR4/sTwkct TKmkQKtGsW7kCpQZuSdZC6viwyB087NSBjrngaF4= Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [95.163.41.77]) (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 D4AA651863A for ; Mon, 10 Jul 2023 13:51:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D4AA651863A Received: by smtp36.i.mail.ru with esmtpa (envelope-from ) id 1qIoU5-00ASPE-TE; Mon, 10 Jul 2023 13:51:14 +0300 To: Igor Munkin , Maxim Kokryashkin Date: Mon, 10 Jul 2023 13:46:49 +0300 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9F6142ABD4516DDC5081FADD37C191A8C18BC49CE86EDB7AF182A05F538085040C1342691F5630D0FBCBA6CEC7806082CFF48AD92DB0AC089C18A5534BF18166E X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE731D82F3F177D3BCDEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637FD85A7F5EB0E97528638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8BC4C88005AF7AF00AC4AA7FBB3D7BF77117882F4460429724CE54428C33FAD305F5C1EE8F4F765FCF80095D1E57F4578A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735204B6963042765DA4BF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CB2DECCBDF547A30576E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8B120C23C05AEC2B18EC76A7562686271ED91E3A1F190DE8FD2E808ACE2090B5E14AD6D5ED66289B5278DA827A17800CE754F43A495B1ACFC12EB15956EA79C166A417C69337E82CC275ECD9A6C639B01B78DA827A17800CE75A9E79F66F1C28F3731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A530C56A13CA447D31914FAC97BC534F399E9AC8EFD58CF6DBF87CCE6106E1FC07E67D4AC08A07B9B0CE135D2742255B359C5DF10A05D560A950611B66E3DA6D700B0A020F03D25A092FFDA4F57982C5F4CB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF0EF3D8C2126B16010722166291CA1F1E65D71E2853F2FAFE2D8888F286E9127812B9ACBE231CC78A84815E46D7AAED534F8A7E88E826957CE4D59DC772CC7D77A74DFFEFA5DC0E7F02C26D483E81D6BE5EF9655DD6DEA7D65774BB76CC95456EEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojREMDzwhiTMYyU0YVyVkyDg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769C7EE78118780B6CFBCBA6CEC7806082C52685D71546B8E9EDEDBA653FF35249392D99EB8CC7091A70E183A470755BFD208F19895AA18418972D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 2/2] Fix maxslots when recording BC_VARG, part 2. 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 Analyzed by Sergey Kaplun. (cherry-picked from commit a01cba9d2d74efc57376822aa43db2d5043af5a4) This patch is the follow-up for the previous one. It removes the condition for `maxslot` changing in the case when varargs are defined on the trace (i.e. `framedepth` > 0). Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#8825 --- src/lj_record.c | 8 ++------ .../lj-1024-varg-maxslot.test.lua | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/lj_record.c b/src/lj_record.c index 112524d3..02d9db9e 100644 --- a/src/lj_record.c +++ b/src/lj_record.c @@ -1775,12 +1775,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults) if (J->framedepth > 0) { /* Simple case: varargs defined on-trace. */ ptrdiff_t i; if (nvararg < 0) nvararg = 0; - if (nresults == -1) { - nresults = nvararg; - J->maxslot = dst + (BCReg)nvararg; - } else if (dst + nresults > J->maxslot) { - J->maxslot = dst + (BCReg)nresults; - } + if (nresults == -1) nresults = nvararg; + J->maxslot = dst + (BCReg)nresults; for (i = 0; i < nresults; i++) J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1 - LJ_FR2) : TREF_NIL; } else { /* Unknown number of varargs passed to trace. */ diff --git a/test/tarantool-tests/lj-1024-varg-maxslot.test.lua b/test/tarantool-tests/lj-1024-varg-maxslot.test.lua index 14270595..f8d74e8a 100644 --- a/test/tarantool-tests/lj-1024-varg-maxslot.test.lua +++ b/test/tarantool-tests/lj-1024-varg-maxslot.test.lua @@ -3,7 +3,7 @@ local test = tap.test('lj-noticket-varg-usedef'):skipcond({ ['Test requires JIT enabled'] = not jit.status(), }) -test:plan(1) +test:plan(2) jit.opt.start('hotloop=1') @@ -20,4 +20,21 @@ end test:ok(true, 'BC_VARG recording 0th frame depth') +-- Now the same case, but with additional frame, so VARG slots +-- are defined on the trace. +local function bump_varg_frame(...) + -- BC_VARG 1 1 0. `...` is nil (argument for the script). + -- luacheck: ignore + -- XXX: some condition to use several slots on the Lua stack. + anchor = 1 >= 1, ... +end + +counter = 0 +while counter < 3 do + counter = counter + 1 + bump_varg_frame() +end + +test:ok(true, 'BC_VARG recording with defined on trace VARG slots') + os.exit(test:check() and 0 or 1) -- 2.34.1