diff options
| author | Mike Pall <mike> | 2017-11-08 12:53:24 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-11-08 12:53:24 +0100 |
| commit | 4b17a6a2ff4c93304433e13fc0e55d0a33a10318 (patch) | |
| tree | c2fe8ffe6a988cda84caa658f17db137167874a4 | |
| parent | 850f8c59d3d04a9847f21f32a6c36d8269b5b6b1 (diff) | |
| parent | 9f0caad0e43f97a4613850b3874b851cb1bc301d (diff) | |
| download | luajit-4b17a6a2ff4c93304433e13fc0e55d0a33a10318.tar.gz luajit-4b17a6a2ff4c93304433e13fc0e55d0a33a10318.tar.bz2 luajit-4b17a6a2ff4c93304433e13fc0e55d0a33a10318.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_opt_fold.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index acbf36a5..9873b47e 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -1227,7 +1227,7 @@ LJFOLDF(simplify_conv_sext) | |||
| 1227 | if (ref == J->scev.idx) { | 1227 | if (ref == J->scev.idx) { |
| 1228 | IRRef lo = J->scev.dir ? J->scev.start : J->scev.stop; | 1228 | IRRef lo = J->scev.dir ? J->scev.start : J->scev.stop; |
| 1229 | lua_assert(irt_isint(J->scev.t)); | 1229 | lua_assert(irt_isint(J->scev.t)); |
| 1230 | if (lo && IR(lo)->i + ofs >= 0) { | 1230 | if (lo && IR(lo)->o == IR_KINT && IR(lo)->i + ofs >= 0) { |
| 1231 | ok_reduce: | 1231 | ok_reduce: |
| 1232 | #if LJ_TARGET_X64 | 1232 | #if LJ_TARGET_X64 |
| 1233 | /* Eliminate widening. All 32 bit ops do an implicit zero-extension. */ | 1233 | /* Eliminate widening. All 32 bit ops do an implicit zero-extension. */ |