Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2017-11-08 12:53:24 +01:00
commit 4b17a6a2ff

View File

@ -1227,7 +1227,7 @@ LJFOLDF(simplify_conv_sext)
if (ref == J->scev.idx) { if (ref == J->scev.idx) {
IRRef lo = J->scev.dir ? J->scev.start : J->scev.stop; IRRef lo = J->scev.dir ? J->scev.start : J->scev.stop;
lua_assert(irt_isint(J->scev.t)); lua_assert(irt_isint(J->scev.t));
if (lo && IR(lo)->i + ofs >= 0) { if (lo && IR(lo)->o == IR_KINT && IR(lo)->i + ofs >= 0) {
ok_reduce: ok_reduce:
#if LJ_TARGET_X64 #if LJ_TARGET_X64
/* Eliminate widening. All 32 bit ops do an implicit zero-extension. */ /* Eliminate widening. All 32 bit ops do an implicit zero-extension. */