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 47B855C16B2; Thu, 17 Aug 2023 15:01:59 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 47B855C16B2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1692273719; bh=XhLF6tpUEVJE3gEsk7ZSbijZJFf+ihRYz29Q8aZB444=; 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=VPzS46UPyVcH60RiK0MLK8r1fGIe5aXGUrTPCIK98A4TEoeX95TV7S5HhI7MuRu4k Ddrx45q4UtNYeK2BYOqHPx80QDUEQ29ypXBMW06BVoa+MaJJvA5eaK9qBTpv+026Ec r2enchZ8n1jnofdZTFVnC0wCStQzTbsm4kMUjPaU= Received: from smtp51.i.mail.ru (smtp51.i.mail.ru [95.163.41.87]) (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 C596A581FDB for ; Thu, 17 Aug 2023 15:01:57 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C596A581FDB Received: by smtp51.i.mail.ru with esmtpa (envelope-from ) id 1qWbhM-003e7O-1d; Thu, 17 Aug 2023 15:01:57 +0300 Message-ID: Date: Thu, 17 Aug 2023 15:01:56 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: Sergey Kaplun , Igor Munkin References: 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: 4F1203BC0FB41BD9700E0DCE2907754D9B1C46D604AD036F8866CBFA63B460F7182A05F5380850408C701CE5D1207698E9758C80C59CACECD35497ECA4B8B8E6D5CB798AD27AB450 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE71BB7708D34E2BFDAEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006374E88016F1B7D8D248638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8AC4EF19E5BE1F083D4B144CF7C601DB4117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3EA24FE487C076E5A471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18E5D25F19253116ADD2E47CDBA5A96583BA9C0B312567BB2376E601842F6C81A19E625A9149C048EE9647ADFADE5905B1A68A47777D5C6D9CD8FC6C240DEA76429C9F4D5AE37F343AA9539A8B242431040A6AB1C7CE11FEE3AD0E433DBF1FBFA39735652A29929C6CC4224003CC836476E2F48590F00D11D6E2021AF6380DFAD1A18204E546F3947C2FFDA4F57982C5F42E808ACE2090B5E1725E5C173C3A84C3E97D2AE7161E217F089D37D7C0E48F6C8AA50765F79006373BA04B6A498D0BA4731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A504110B2E24F1C897E395850ABED13C76C6CF5357FD83DF48F87CCE6106E1FC07E67D4AC08A07B9B065B78C30F681404DCB5012B2E24CD356 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF676AF2E0D9B23D514D1B71CDDA9710CFC6A18AF101539003FBA109ABD9BDECA2BDB65CFD5BA197A724F7434E9608BF9FD8C029622D2BCADB174D213AF4FFC1E3A74DFFEFA5DC0E7F02C26D483E81D6BE0DBAE6F56676BC7117BB6831D7356A2DEC5B5AD62611EEC62B5AFB4261A09AF0 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojFRrmMqSMPxoijxTE2SPyJA== X-Mailru-Sender: 11C2EC085EDE56FAC07928AF2646A769F58A6E16352D246AE9758C80C59CACECC9F871340C5A6C40EBA65886582A37BD66FEC6BF5C9C28D98A98C1125256619760D574B6FC815AB872D6B4FCE48DF648AE208404248635DF X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 18/19] DynASM/MIPS: Fix shadowed variable. 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" Hi, Sergey thanks for the patch! LGTM (to be honestly I'm a bit confused why a single warning was fixed, when luacheck reports about 112 warnings in dynasm/ directory. But this question is out of scope of backporting.). Sergey On 8/9/23 18:36, Sergey Kaplun wrote: > From: Mike Pall > > Cleanup only, bug cannot trigger. > Thanks to Domingo Alvarez Duarte. > > (cherry-picked from commit 5c911998a3c85d024a8006feafc68d0b4c962fd8) > > This patch fixes local shadow variable `n` in `template__` function from > by renaming it to `m`. Since this cannot be > triggered, there is no test provided. > > Sergey Kaplun: > * added the description for the problem > --- > dynasm/dasm_mips.lua | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/dynasm/dasm_mips.lua b/dynasm/dasm_mips.lua > index 78a4e34a..bd2a2b43 100644 > --- a/dynasm/dasm_mips.lua > +++ b/dynasm/dasm_mips.lua > @@ -809,9 +809,9 @@ map_op[".template__"] = function(params, template, nparams) > elseif p == "X" then > op = op + parse_index(params[n]); n = n + 1 > elseif p == "B" or p == "J" then > - local mode, n, s = parse_label(params[n], false) > - if p == "B" then n = n + 2048 end > - waction("REL_"..mode, n, s, 1) > + local mode, m, s = parse_label(params[n], false) > + if p == "B" then m = m + 2048 end > + waction("REL_"..mode, m, s, 1) > n = n + 1 > elseif p == "A" then > op = op + parse_imm(params[n], 5, 6, 0, false); n = n + 1