diff options
author | Mike Pall <mike> | 2023-04-16 13:29:58 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2023-04-16 13:29:58 +0200 |
commit | 8bbd58e534522a7e1ab9ee2c0d7fb723741dd089 (patch) | |
tree | fd8838460345c81252295db5b03419070c6889e1 /src/lj_record.c | |
parent | 505e2c03de35e2718eef0d2d3660712e06dadf1f (diff) | |
parent | c7db8255e1eb59f933fac7bc9322f0e4f8ddc6e6 (diff) | |
download | luajit-8bbd58e534522a7e1ab9ee2c0d7fb723741dd089.tar.gz luajit-8bbd58e534522a7e1ab9ee2c0d7fb723741dd089.tar.bz2 luajit-8bbd58e534522a7e1ab9ee2c0d7fb723741dd089.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_record.c')
-rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 79ee6172..b2639cbc 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
@@ -1600,6 +1600,8 @@ TRef lj_record_idx(jit_State *J, RecordIndex *ix) | |||
1600 | TRef key = ix->key; | 1600 | TRef key = ix->key; |
1601 | if (tref_isinteger(key)) /* NEWREF needs a TValue as a key. */ | 1601 | if (tref_isinteger(key)) /* NEWREF needs a TValue as a key. */ |
1602 | key = emitir(IRTN(IR_CONV), key, IRCONV_NUM_INT); | 1602 | key = emitir(IRTN(IR_CONV), key, IRCONV_NUM_INT); |
1603 | else if (tref_isnumber(key) && tref_isk(key) && tvismzero(&ix->keyv)) | ||
1604 | key = lj_ir_knum_zero(J); /* Canonicalize -0.0 to +0.0. */ | ||
1603 | xref = emitir(IRT(IR_NEWREF, IRT_PGC), ix->tab, key); | 1605 | xref = emitir(IRT(IR_NEWREF, IRT_PGC), ix->tab, key); |
1604 | keybarrier = 0; /* NEWREF already takes care of the key barrier. */ | 1606 | keybarrier = 0; /* NEWREF already takes care of the key barrier. */ |
1605 | #ifdef LUAJIT_ENABLE_TABLE_BUMP | 1607 | #ifdef LUAJIT_ENABLE_TABLE_BUMP |