From 25effba1c0c98ae27d662f848ce3e05a1e064365 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Wed, 15 Nov 2023 01:41:31 +0100 Subject: [PATCH] Fix last commit. (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 Reviewed-by: Sergey Bronnikov Signed-off-by: Sergey Kaplun (cherry picked from commit ffede1b1ff2cf0241d1ad605cb911774868800a2) --- 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 d77087d697..a96bc2e7ac 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;