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 F2782A7F8E3; Wed, 13 Mar 2024 15:39:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org F2782A7F8E3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1710333564; bh=3T3Zo0t8nGVfZk87jVhq4tYjDUbKT5p9WrO5tay6uBg=; 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=KB6+YHxBEYoVJT0zbA8HPT3Bi12fOBgLVStD8FIOPs5HwxE2ONW/Evt7cin+7dVpP y0AojgDqS1SDx39rgGyNMLhEpUpPEBtTPKr5CAByeBpTHOIlAYxpNjAyb7DNDZ8XW7 0oiJYNzm00F015YT/3BunKlYmjeGEdFjFcGAj3mo= Received: from smtp47.i.mail.ru (smtp47.i.mail.ru [95.163.41.85]) (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 7919346DF3A for ; Wed, 13 Mar 2024 15:39:22 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7919346DF3A Received: by smtp47.i.mail.ru with esmtpa (envelope-from ) id 1rkNtB-00000006lz2-0NTL; Wed, 13 Mar 2024 15:39:21 +0300 Date: Wed, 13 Mar 2024 15:35:21 +0300 To: Sergey Bronnikov Message-ID: References: <20240312052627.21222-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD987C0EE6E7F0A597D21AFE2E000C69B1FB60C465D22E5E337182A05F538085040B16F8E8792A3A6932EB5D77EF37489D1A87AD5EA665A8380F6615C03C8A84207E5BD31BE838A11F7 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE70312E9A300D47E3BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637A1EC320DD04F715B8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D856A4AE7D24FE829B2F49918E208BCB0074B6C5AA9BECD511CC7F00164DA146DAFE8445B8C89999728AA50765F7900637F3E38EE449E3E2AE389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C1E1736EDDE8D4790302FCEF25BFAB3454AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3055A3127ECEB1CB3BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CF17B107DEF921CE791DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3C9EEE74C166EF7BC35872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5936196048B92F5995002B1117B3ED6963DEC160329F5C47AA9DAB4B68AE4D22F823CB91A9FED034534781492E4B8EEADAEB4DDBFD72C8FA1BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF0C1FEC362C2B83C23C684C12E22DBCC6486B0D66E01ED605361A4C166967F9218B42E79199D3D3ED7C77D8D956826D33B7EB325F92EC68413C0B779FED592FDD67914FE9E1251EDE5F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojtv/CB9kl0S0MDiZ+w2qfGg== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A76956D25207DD5BD7C32EB5D77EF37489D1A87AD5EA665A8380B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] Check frame size limit before returning to a lower frame. 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" Sergey, Thanks for the review! Fixed your comment and force-pushed the branch. On 13.03.24, Sergey Bronnikov wrote: > Sergey, > > LGTM with minor comment below. > > On 3/13/24 12:37, Sergey Kaplun wrote: > > =================================================================== > > diff --git a/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua b/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua > > index 91e2c603..468462d2 100644 > > --- a/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua > > +++ b/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua > > @@ -44,9 +44,11 @@ local LJ_MAX_JSLOTS = 250 > > -- `maxslot` (the first free slot) to 249. Hence, the JIT slots > > -- are overflowing. > > > > -local chunk = 'local uv = {key = 1}\n' > > -chunk = chunk .. 'return function()\n' > > -chunk = chunk .. 'local r = retf()\n' > > +local chunk = [[ > > +local uv = {key = 1} > > +return function() > > + local r = retf() > > + ]] > > here brackets are on a new line with indentation and below brackets on > the same line with code. > > looks inconsistently. I've used such indentation to create a human-readable chunk: | return function() | local r = retf() | uv.key, ..., uv_key = nil | end Instead of: | return function() | local r = retf() | uv.key, ..., uv_key = nil | end Since nobody wants to read this chunk as is, I've removed 2 spaces to avoid confusion. See the iterative patch below. Branch is force-pushed. =================================================================== diff --git a/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua b/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua index b454003e..cfaecbce 100644 --- a/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua +++ b/test/tarantool-tests/lj-1173-frame-limit-lower-frame.test.lua @@ -51,7 +51,7 @@ local chunk = [[ local uv = {key = 1} return function() local r = retf() - ]] +]] -- Each `UGET` occupies 1 slot, `KNIL` occupies the same amount. -- 1 slot is reserved (`r` variable), 1 pair is set outside the =================================================================== > > > > > -- Each `UGET` occupies 1 slot, `KNIL` occupies the same amount. > > -- 1 slot is reserved (`r` variable), 1 pair is set outside the > > @@ -56,8 +58,8 @@ chunk = chunk .. 'local r = retf()\n' > > for _ = 1, LJ_MAX_JSLOTS / 2 - 2 do > > chunk = chunk .. ('uv.key, ') > > end > > -chunk = chunk .. 'uv.key = nil\n' > > -chunk = chunk .. 'end\n' > > +chunk = chunk .. [[uv.key = nil > > +end]] > > > > local get_func = assert(loadstring(chunk)) > > local function_max_framesize = get_func() > > =================================================================== > > -- Best regards, Sergey Kaplun