Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2020-05-22 03:30:55 +02:00
commit c5b8e9168b

View File

@ -853,9 +853,12 @@ static void bcemit_comp(FuncState *fs, BinOpr opr, ExpDesc *e1, ExpDesc *e2)
e1 = e2; e2 = eret; /* Swap operands. */ e1 = e2; e2 = eret; /* Swap operands. */
op = ((op-BC_ISLT)^3)+BC_ISLT; op = ((op-BC_ISLT)^3)+BC_ISLT;
expr_toval(fs, e1); expr_toval(fs, e1);
} ra = expr_toanyreg(fs, e1);
rd = expr_toanyreg(fs, e2);
} else {
rd = expr_toanyreg(fs, e2); rd = expr_toanyreg(fs, e2);
ra = expr_toanyreg(fs, e1); ra = expr_toanyreg(fs, e1);
}
ins = BCINS_AD(op, ra, rd); ins = BCINS_AD(op, ra, rd);
} }
/* Using expr_free might cause asserts if the order is wrong. */ /* Using expr_free might cause asserts if the order is wrong. */