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 A21DDF25042; Fri, 10 Jan 2025 16:10:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A21DDF25042 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1736514623; bh=mVRTxdMmT1WDZYS90rvQQHc2ErQCyNwvI8gm9Hk0dc4=; 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=pXbq67GIKiPUjwX40tCphSdJz08XgCZNJHsWEjWB5WZJPoZ5E5VyJPTdtiR4Pd1bI tUZDpN1beIw8Wu8FRm6q/Sy06V6JNoG3rXl5xiltVh4HgkGgxRrjJ16E70O9LCrOk0 rdo9WrRkg46DZaf527KaNA5rpTp0nNqmd7z40lVk= Received: from send149.i.mail.ru (send149.i.mail.ru [89.221.237.244]) (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 4BC6BF1A9B0 for ; Fri, 10 Jan 2025 16:08:24 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4BC6BF1A9B0 Received: by exim-smtp-bcf9586c5-mw6cv with esmtpa (envelope-from ) id 1tWEkR-00000000Ued-1OoU; Fri, 10 Jan 2025 16:08:23 +0300 To: Sergey Bronnikov Date: Fri, 10 Jan 2025 16:07:47 +0300 Message-ID: <21c87151ad7c919b12f90d8590697e190f6b5e0c.1736509260.git.skaplun@tarantool.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD97C62A2C8925CC6475EB1DE9CB11F615261801260394DC45D182A05F538085040F3E546D20766C30F3DE06ABAFEAF67052E7603E18402EA43D3E5D342215B9A64B87F5774AF1921ED X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F9D3BE5B596754B8C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE7711EC8ACFEA21396EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BC08E230531AC9C90C660F836A74DD0EC75323D52C3A77B158F0540392536EACBA471835C12D1D9774AD6D5ED66289B5278DA827A17800CE767883B903EA3BAEA9FA2833FD35BB23D2EF20D2F80756B5F868A13BD56FB6657A471835C12D1D977725E5C173C3A84C3A333A05395E4745B117882F4460429728AD0CFFFB425014E868A13BD56FB6657E2021AF6380DFAD1A18204E546F3947CB11811A4A51E3B096D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F79006371F24DFF1B2961425731C566533BA786AA5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A58373254F6D1F64275002B1117B3ED696AFE32F2A57812D7A92212597CCBD6D77823CB91A9FED034534781492E4B8EEAD27E9584FBD6BDD31C79554A2A72441328621D336A7BC284946AD531847A6065AED8438A78DFE0A9EBDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF5E1939A1ADAD23CA13B50F62F7979112EAAAEE5DB88FA494364DC33F256F5A0B4A7F0923522A066E6BAACDEF235ECA6ED09BF57608EF24D0D7101C3931F3FA3C25E3CA607F1F1E195F4332CA8FE04980913E6812662D5F2A5EAB5682573093F7837F15F2B5E4A70B33F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojXhNIkWce4y1wYwZYfviZwg== X-DA7885C5: CC41B943F95E8832F255D290C0D534F96BF07FBC4EA01AD7B98508E0FC65CA50FDE149E5378DAE965B1A4C17EAA7BC4BEF2421ABFA55128DAF83EF9164C44C7E X-Mailru-Sender: 689FA8AB762F739381B31377CF4CA2197C01CA057A633496DFCB6B24D75F5A4E9DFC97937B3B748AE49D44BB4BD9522A059A1ED8796F048DB274557F927329BE89D5A3BC2B10C37545BD1C3CC395C826B4A721A3011E896F X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 4/4] Fix last commit. 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 (cherry picked from commit 43d0a19158ceabaa51b0462c1ebc97612b420a2e) The previous commit accidentally removes the check that fusing optimization isn't performing across the call to the `table.clear()`. This commit fixes the behaviour by adding the corresponding check that depends on the first bit of `check` masks in the `noconflict()` routine. Sergey Kaplun: * added the description for the problem Part of tarantool/tarantool#10709 --- src/lj_asm_x86.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index d77087d6..a96bc2e7 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h @@ -118,7 +118,7 @@ static int noconflict(ASMState *as, IRRef ref, IROp conflict, int check) while (--i > ref) { if (ir[i].o == conflict) return 0; /* Conflict found. */ - else if ((check & 1) && ir[i].o == IR_NEWREF) + else if ((check & 1) && (ir[i].o == IR_NEWREF || ir[i].o == IR_CALLS)) return 0; else if ((check & 2) && (ir[i].op1 == ref || ir[i].op2 == ref)) return 0; -- 2.47.1