Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2019-11-10 22:39:40 +01:00
commit e45b04f499

View File

@ -1261,8 +1261,8 @@ LJFOLDF(simplify_conv_narrow)
IRType t = irt_type(fins->t);
IRRef op1 = fleft->op1, op2 = fleft->op2, mode = fins->op2;
PHIBARRIER(fleft);
op1 = emitir(IRTI(IR_CONV), op1, mode);
op2 = emitir(IRTI(IR_CONV), op2, mode);
op1 = emitir(IRT(IR_CONV, t), op1, mode);
op2 = emitir(IRT(IR_CONV, t), op2, mode);
fins->ot = IRT(op, t);
fins->op1 = op1;
fins->op2 = op2;