diff options
| author | Mike Pall <mike> | 2019-11-10 22:39:40 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2019-11-10 22:39:40 +0100 |
| commit | e45b04f49953b4e0cc2b3cec4dbe4c2c0a2656f3 (patch) | |
| tree | e2218bb0cd2a0b2b62cd35b77605675f0f9eb275 /src | |
| parent | 8755e0b74b71b4e26e31caa9fe8e0a3de8364c21 (diff) | |
| parent | c4e15b457e37a68b9c19cc139f3d24dc37c4490b (diff) | |
| download | luajit-e45b04f49953b4e0cc2b3cec4dbe4c2c0a2656f3.tar.gz luajit-e45b04f49953b4e0cc2b3cec4dbe4c2c0a2656f3.tar.bz2 luajit-e45b04f49953b4e0cc2b3cec4dbe4c2c0a2656f3.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_opt_fold.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index 9873b47e..276dc040 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -1261,8 +1261,8 @@ LJFOLDF(simplify_conv_narrow) | |||
| 1261 | IRType t = irt_type(fins->t); | 1261 | IRType t = irt_type(fins->t); |
| 1262 | IRRef op1 = fleft->op1, op2 = fleft->op2, mode = fins->op2; | 1262 | IRRef op1 = fleft->op1, op2 = fleft->op2, mode = fins->op2; |
| 1263 | PHIBARRIER(fleft); | 1263 | PHIBARRIER(fleft); |
| 1264 | op1 = emitir(IRTI(IR_CONV), op1, mode); | 1264 | op1 = emitir(IRT(IR_CONV, t), op1, mode); |
| 1265 | op2 = emitir(IRTI(IR_CONV), op2, mode); | 1265 | op2 = emitir(IRT(IR_CONV, t), op2, mode); |
| 1266 | fins->ot = IRT(op, t); | 1266 | fins->ot = IRT(op, t); |
| 1267 | fins->op1 = op1; | 1267 | fins->op1 = op1; |
| 1268 | fins->op2 = op2; | 1268 | fins->op2 = op2; |