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 23C2DD96F06; Wed, 13 Mar 2024 16:03:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 23C2DD96F06 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1710335018; bh=krw+9/dmK21kPDvqHFifYfwOZcdSuX4a5Fqi54WMIbk=; 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=Wyc9cQOobAqeB6LaibW2qYkqh1OXQEMNaM0SK1N2bxh8+Qsnc+OhKQzHKm2rAbZhd OQwg8pwsoGVlPvqmFbSld5b2qz9Hqs92MCTnbdznAmFSyFGN5SUwU3N/FfWXvt6DvR FHshIRvrC0Lu0WlBnli31lXzNqi4g/Ah3/eRG3Fk= Received: from smtp39.i.mail.ru (smtp39.i.mail.ru [95.163.41.80]) (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 7401D46DF3A for ; Wed, 13 Mar 2024 16:03:36 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 7401D46DF3A Received: by smtp39.i.mail.ru with esmtpa (envelope-from ) id 1rkOGc-000000086Rj-2ojo; Wed, 13 Mar 2024 16:03:35 +0300 Message-ID: <0bedf3ab-a4fd-45eb-8cb4-9753166df887@tarantool.org> Date: Wed, 13 Mar 2024 16:03:34 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Sergey Kaplun References: <20240312052627.21222-1-skaplun@tarantool.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD987C0EE6E7F0A597DA4A6782E56D87B648E017E9626570F41182A05F538085040227280034D418224C7A4B249DE6549FDD49B28AF8370099392440A21037FE526599FBF3E6EA3F319 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7D6964C9E324ABA58EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D19C480A18FAEE108638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8DF961FB20E6553D0D33210BC45D1E9B973594FE9DE31B044CC7F00164DA146DAFE8445B8C89999728AA50765F7900637CAEE156C82D3D7D9389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8062BEEFFB5F8EA3EF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CA6C7FFFE744CA7FB9735652A29929C6C4AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3A795DF33A22FB294BA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3AC2D04D201A9A352089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5278058032510F4E85002B1117B3ED6968C528887BB72DA489E040399BDE4761E823CB91A9FED034534781492E4B8EEADB1D70E2111C441FFBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CFBF12F41BDBF23068D23EB04E3CCBABA182F00786E454EA15FD0D1EF989182D26C150D9F1A63664457C77D8D956826D336FF3057B0A1DA8C4DEA6859EE1DB92D675568ACD48940E2E5F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojtv/CB9kl0S3SIEojgMv8Ag== X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F2588458AC95C5E401AA88337FC47A557B39A39BBDBBE9AE647D34EDFCDC605A8BEF2AC7645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 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 Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, thanks for the fixes! LGTM On 3/13/24 15:35, Sergey Kaplun wrote: > 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() >>> =================================================================== >>> > >