This patch adds the aforementioned canonicalization.
Sergey Bronnikov:
* reported the original issue for the TDUP IR
Sergey Kaplun:
* added the description and the test for the problem
Part of tarantool/tarantool#8516
---
Side note: I don't mention the 981 issue by intend -- I don't want to
bother Mike with force pushes:). I suppose Igor should add this line (if
he wants) went this commit will be cherry-picked to our master branch
(a.k.a. tarantool).
src/lj_record.c | 2 +
.../tarantool-tests/lj-981-folding-0.test.lua | 57 +++++++++++++++++++
2 files changed, 59 insertions(+)
create mode 100644 test/tarantool-tests/lj-981-folding-0.test.lua
diff --git a/src/lj_record.c b/src/lj_record.c
index 9e2e1d9e..cc44db8d 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1474,6 +1474,8 @@ TRef lj_record_idx(jit_State *J, RecordIndex *ix)
TRef key = ix->key;
if (tref_isinteger(key)) /* NEWREF needs a TValue as a key. */
key = emitir(IRTN(IR_CONV), key, IRCONV_NUM_INT);
+ else if (tref_isnumber(key) && tref_isk(key) && tvismzero(&ix->keyv))
+ key = lj_ir_knum_zero(J); /* Canonicalize -0.0 to +0.0. */
xref = emitir(IRT(IR_NEWREF, IRT_PGC), ix->tab, key);
keybarrier = 0; /* NEWREF already takes care of the key barrier. */
#ifdef LUAJIT_ENABLE_TABLE_BUMP
diff --git a/test/tarantool-tests/lj-981-folding-0.test.lua b/test/tarantool-tests/lj-981-folding-0.test.lua
new file mode 100644
index 00000000..251da24d
--- /dev/null
+++ b/test/tarantool-tests/lj-981-folding-0.test.lua
@@ -0,0 +1,57 @@
+local tap = require('tap')
+local test = tap.test('lj-981-folding-0'):skipcond({
+ ['Test requires JIT enabled'] = not jit.status(),
+ ['Disabled on *BSD due to #4819'] = jit.os == 'BSD',
+})
+
+-- Test file to demonstrate LuaJIT misbehaviour on load forwarding
+-- for -0 IR constant as table index.
+-- See also,
https://github.com/LuaJIT/LuaJIT/issues/981.
+
+local jparse = require('utils.jit_parse')
+
+jit.opt.start('hotloop=1')
+
+test:plan(4)
+
+-- Reset traces.
+jit.flush()
+
+jparse.start('i')
+local result
+local expected = 'result'
+-- TNEW:
+-- -0 isn't folded during parsing, so it will be set with KSHORT,
+-- UNM bytecodes. See <src/lj_parse.c> and bytecode listing
+-- for details.
+-- Because of it, empty table is created via TNEW.
+for _ = 1, 4 do
+ result = ({[-0] = expected})[0]
+end
+
+local traces = jparse.finish()
+
+-- Test that there is no any assertion failure.
+test:ok(result == expected, 'TNEW and -0 folding')
+-- Test that there is no NEWREF -0 IR.
+test:ok(not traces[1]:has_ir('NEWREF.*-0'), '-0 is canonized for TNEW tab')
+
+-- Reset traces.
+jit.flush()
+
+jparse.start('i')
+-- TDUP:
+-- Now just add a constant field for the table to use TDUP with
+-- template table instead TNEW before -0 is set.
+for _ = 1, 4 do
+ result = ({[-0] = expected, [1] = 1})[0]
+end
+
+traces = jparse.finish()
+
+-- Test that there is no any assertion failure.
+test:ok(result == expected, 'TDUP and -0 folding')
+-- Test that there is no NEWREF -0 IR.
+test:ok(not traces[1]:has_ir('NEWREF.*-0'), '-0 is canonized for TDUP tab')
+
+os.exit(test:check() and 0 or 1)
--
2.34.1