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 B25606F81F; Wed, 18 Nov 2026 17:23:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B25606F81F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1795011791; bh=OBEn3Xx9UziagOAr62W1qoCWo3o7yQrcvwFP+4PBNmE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Ff8KZyCmqFBGUw50ncfEy0Ya+pQ2ZvlOU4RNNgU5AsMLZC9WhaKBR7qGZiBXMqLi6 EtZOfc/MySqkRRG7hv5VF+nOPQvQtQHfNB1ryCWfrfZEcwEgbouxg1b2qbbQmeO1L+ 978V2LlAcOBUlwGJ5tmRFM6QGbfC4wrUjGvnWp9M= Received: from send57.i.mail.ru (send57.i.mail.ru [89.221.237.152]) (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 D0FBC6F81F for ; Wed, 18 Nov 2026 17:23:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D0FBC6F81F Received: by exim-smtp-56bb8ff957-8l2th with esmtpa (envelope-from ) id 1xTgZ2-00000000X8t-2zbi; Wed, 18 Nov 2026 17:23:09 +0300 To: Sergey Bronnikov , Evgeniy Temirgaleev Date: Wed, 18 Nov 2026 17:22:42 +0300 Message-ID: <20261118142242.3718800-1-skaplun@tarantool.org> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailru-Src: smtp X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9749DDC91F62168F93153D52FBA18BB599117403A6E84CCF3182A05F53808504050D68850FB6BBE153DE06ABAFEAF670529F657F9210949E28DFBA41C38CCDB19CBBB4FF5790A3399 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7CE4525FFB91B9BBCEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375660E512E38EA290F4F0B45A7498689155694EE1C293C5B74F8132D79B3C4211A27389733CBF5DBD5E9D5E8D9A59859A8B6A70DDFFB3186CBC5CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8090A508E0FED6299176DF2183F8FC7C0A825F8AE102D15AACD04E86FAF290E2DB606B96278B59C421DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B658CDF7FFE3EBBCC0089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5193192934C7BD8E35002B1117B3ED6964EFA7C75BB09A94FB2920F75BA9A967F823CB91A9FED034534781492E4B8EEADF12279BA039A6965C79554A2A72441328621D336A7BC284946AD531847A6065A17B107DEF921CE79BDAD6C7F3747799A X-C8649E89: 1C3962B70DF3F0AD73CAD6646DEDE1918E10F71CB4DF9F9677DD89D51EBB774225B6776AC983F447FC0B9F89525902EE6F57B2FD27647F25E66C117BDB76D6598162B50C99EE94BE6336F2C8BD2ABC13B2FFBB6A81275862EB5C0AA0C1D81375F7E85D472FF8AC38B8341EE9D5BE9A0A8461D6CEDBB92F0F2941CCE89505349B3881767E1F0FBB67C7CEAA0681F5848F4C41F94D744909CECFA6C6B0C050A61A8CAF69B82BA93681CD72808BE417F3B9E0E7457915DAA85F X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXOcIETfglQORZ0zpDET4Zrk3igikrdHlWLQ7wr6FUU7XOphDQ8QPJMA= X-Mailru-Sender: 520A125C2F17F0B17094CDC02B85F11B27574295BDE9404B3DE06ABAFEAF670529F657F9210949E2B7CBEF92542CD7C88B0A2698F12F5C9EC77752E0C033A69E86920BD37369036789A8C6A0E60D2BB63A5DB60FBEB33A8A0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit] x86/x64: Don't sink IR_CONV num.int with -O-dce. 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 Reported by aleksisch. Thanks to Sergey Kaplun. (cherry picked from commit 592f9e3f549c7f176a9a7a0d70189559305f2eda) The CONV num.int is sunk even with disabled DCE optimization (which is required for sink optimization). Hence, the register allocated for CONV IR is the same as for the next IR (ADD, for example). This leads to the incorrect results when exiting to the interpreter since the register content is modified by the next instruction. This patch fixes this by disabling sinking of the `IR_CONV` with disabled DCE. Sergey Kaplun: * added the description and the test for the problem Part of tarantool/tarantool#13442 --- Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1537-conv-sink-without-dce Related issues: * https://github.com/LuaJIT/LuaJIT/issues/1537 * https://github.com/tarantool/tarantool/issues/13442 Side note: macOS (x86_64) CI is red due to runner problems. src/lj_asm.c | 3 +- .../lj-1537-conv-sink-without-dce.test.lua | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 test/tarantool-tests/lj-1537-conv-sink-without-dce.test.lua diff --git a/src/lj_asm.c b/src/lj_asm.c index f163b2e3..a4d6cf3f 100644 --- a/src/lj_asm.c +++ b/src/lj_asm.c @@ -933,7 +933,8 @@ static void asm_snap_alloc1(ASMState *as, IRRef ref) } } else { RegSet allow; - if (ir->o == IR_CONV && ir->op2 == IRCONV_NUM_INT) { + if (ir->o == IR_CONV && ir->op2 == IRCONV_NUM_INT && + (as->flags & JIT_F_OPT_DCE)) { IRIns *irc; for (irc = IR(as->curins); irc > ir; irc--) if ((irc->op1 == ref || irc->op2 == ref) && diff --git a/test/tarantool-tests/lj-1537-conv-sink-without-dce.test.lua b/test/tarantool-tests/lj-1537-conv-sink-without-dce.test.lua new file mode 100644 index 00000000..4b332acb --- /dev/null +++ b/test/tarantool-tests/lj-1537-conv-sink-without-dce.test.lua @@ -0,0 +1,38 @@ +local tap = require('tap') + +-- Test file to demonstrate LuaJIT incorrect sink of the `IR_CONV` +-- with disabled DCE optimization. +-- See also: https://github.com/LuaJIT/LuaJIT/issues/1537. +local test = tap.test('lj-1537-conv-sink-without-dce'):skipcond({ + ['Test requires JIT enabled'] = not jit.status(), +}) + +test:plan(1) + +jit.opt.start('hotloop=1', '-dce') + +-- Before the patch, the CONV num.int is sunk even with disabled +-- DCE optimization (which is required for sink optimization). +-- Hence, the register allocated for CONV IR is the same as for +-- the next ADD IR, leading to the incorrect results when +-- exiting to the interpreter. +-- | 0004 xmm7 num CONV 0003 num.int +-- | 0005 xmm7 > num SLOAD #4 T +-- | 0006 xmm7 + num ADD 0005 +1 +-- | ... +-- | 0009 ------------ LOOP ------------ +-- | 0010 xmm7 + num ADD 0006 +1 +-- | 0011 rbp + int ADD 0007 +1 +-- | .... SNAP #3 [ ---- ---- ---- 0004 0010 ] + +local t = {} +local conv, n = 0, 0 +for _ = 1, 4 do + -- Need preserve the conversion, not int value in a snap. + conv = #t * 1 + n = n + 1 -- Occupies the same register. +end + +test:is(conv, 0, 'correct value is restored from snapshot') + +test:done(true) -- 2.56.0