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 94C386BD00; Wed, 31 Mar 2021 01:17:35 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 94C386BD00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1617142655; bh=/HWvWmmsN09+WDnClDh0qdeNfOY7ZE5Df87nznjZcT8=; 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=uRwphH7v/6UqO5H/34cZry2fYvPAecNqZ9mmnoSbH2ZCsK6zQKdbpITwILBEXyZ78 QHiipdiH3gQgtccugOfUbzoaDxHbRe8J/lJy7qrRVMV7GtHwsawWKZtl2muVCcJwjf lIAE8e8UEqzQwIDQxLcOpMTuf5RdfWoQqWsWhnP8= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 54FA96BD03 for ; Wed, 31 Mar 2021 01:16:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 54FA96BD03 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1lRMee-000503-CJ; Wed, 31 Mar 2021 01:16:08 +0300 Date: Wed, 31 Mar 2021 01:15:58 +0300 To: Sergey Kaplun Message-ID: <20210330221558.GY29703@tarantool.org> References: <679ac3ff8cbcf449c2e47cc9d4446c3dcf0300d1.1616743343.git.skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <679ac3ff8cbcf449c2e47cc9d4446c3dcf0300d1.1616743343.git.skaplun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9ED7173E37F4E32947287414FD1D04A09E656A5F3377C994A182A05F538085040B9464AAF8884EA9FDA8543E9E75E684DC474E12449C99CE92C6B781367FE8B32 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7E50EC9128971FD6EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063732727FD5A4355FD18638F802B75D45FF914D58D5BE9E6BC131B5C99E7648C95CE99938B3FD79E1DF4709290A9506A009EEFBE87B110078DEA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE7850F8B975A76562C9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3CF36E64A7E3F8E58117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947C0B7D0EA88DDEDAC722CA9DD8327EE493D58E677C372A3F47B25CBF701D1BE873C4224003CC83647689D4C264860C145E X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831CB1BC92B6A8DCFA00D9CEC0EA6A0B831 X-C1DE0DAB: 0D63561A33F958A588923B52DBDADC94008370C1E08A7DE60BE6EF6E23115C8ED59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34505665BFD4C707054B9267BD0B25E11D081028A00E94FC1C7EAB90EED101E01D1EABAFA9353F5C1B1D7E09C32AA3244CFCFDA9858DCC8419780C90D4E34DC920B4DF56057A86259F927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojfQIxm2xDGobl+OPyqZZl+g== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822A6821820ED5D35C2BFFBDBF14777D726A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 luajit 14/30] test: adapt activeline check in the PUC Lua test 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, Thanks for the patch! LGTM, except the nits below. On 26.03.21, Sergey Kaplun wrote: > LuaJIT does not report line with single "end" statement Typo: s/report line/report the line/. > (the last line of the function) as an active line in > debug.getinfo(), unlike Lua does. There is no bytecode > related to this line, so it is "unreachable" and > may be considered not active. > > This patch excludes the last line of a function from the check, Typo: s/a function/the function/. > considering LuaJIT's behaviour. > > Closes tarantool/tarantool#5708 As we discussed before: s/Closes/Resolves/. > Part of tarantool/tarantool#5845 > Part of tarantool/tarantool#4473 > --- > test/PUC-Lua-5.1-tests/db.lua | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/test/PUC-Lua-5.1-tests/db.lua b/test/PUC-Lua-5.1-tests/db.lua > index b363abc..c704877 100644 > --- a/test/PUC-Lua-5.1-tests/db.lua > +++ b/test/PUC-Lua-5.1-tests/db.lua > @@ -491,7 +491,15 @@ local _, l = coroutine.resume(co, 10) > local x = debug.getinfo(co, 1, "lfLS") > assert(x.currentline == l.currentline and x.activelines[x.currentline]) > assert(type(x.func) == "function") > -for i=x.linedefined + 1, x.lastlinedefined do > +-- LuaJIT does not report line with single "end" statement Typo: s/report line/report the line/. > +-- (the last line of the function) as an active line in > +-- debug.getinfo(), unlike Lua does. There is no bytecode > +-- related to this line, so it is "unreachable" and > +-- may be considered not active. > +-- See also https://github.com/tarantool/tarantool/issues/5708. > +-- LuaJIT: Test is adapted for LuaJIT's behaviour by avoiding > +-- the last line check. > +for i=x.linedefined + 1, x.lastlinedefined - 1 do > assert(x.activelines[i]) > x.activelines[i] = nil > end > -- > 2.31.0 > -- Best regards, IM