diff options
| author | Mike Pall <mike> | 2017-03-30 11:38:16 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-03-30 11:38:16 +0200 |
| commit | c29afcb1a3f633fd970cf893d261d7f53728bc69 (patch) | |
| tree | dae90cd7f3880dda7634eb482746c919b2a01215 | |
| parent | 3143b218946395834f0bfef741061ac6ef3f5b56 (diff) | |
| parent | e205ad0c5533c0a538596b63cf12d3fd0e4cc8f2 (diff) | |
| download | luajit-c29afcb1a3f633fd970cf893d261d7f53728bc69.tar.gz luajit-c29afcb1a3f633fd970cf893d261d7f53728bc69.tar.bz2 luajit-c29afcb1a3f633fd970cf893d261d7f53728bc69.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_opt_fold.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index 408811f2..706fbc90 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -448,14 +448,14 @@ LJFOLDF(kfold_int64comp) | |||
| 448 | #if LJ_HASFFI | 448 | #if LJ_HASFFI |
| 449 | uint64_t a = ir_k64(fleft)->u64, b = ir_k64(fright)->u64; | 449 | uint64_t a = ir_k64(fleft)->u64, b = ir_k64(fright)->u64; |
| 450 | switch ((IROp)fins->o) { | 450 | switch ((IROp)fins->o) { |
| 451 | case IR_LT: return CONDFOLD(a < b); | 451 | case IR_LT: return CONDFOLD((int64_t)a < (int64_t)b); |
| 452 | case IR_GE: return CONDFOLD(a >= b); | 452 | case IR_GE: return CONDFOLD((int64_t)a >= (int64_t)b); |
| 453 | case IR_LE: return CONDFOLD(a <= b); | 453 | case IR_LE: return CONDFOLD((int64_t)a <= (int64_t)b); |
| 454 | case IR_GT: return CONDFOLD(a > b); | 454 | case IR_GT: return CONDFOLD((int64_t)a > (int64_t)b); |
| 455 | case IR_ULT: return CONDFOLD((uint64_t)a < (uint64_t)b); | 455 | case IR_ULT: return CONDFOLD(a < b); |
| 456 | case IR_UGE: return CONDFOLD((uint64_t)a >= (uint64_t)b); | 456 | case IR_UGE: return CONDFOLD(a >= b); |
| 457 | case IR_ULE: return CONDFOLD((uint64_t)a <= (uint64_t)b); | 457 | case IR_ULE: return CONDFOLD(a <= b); |
| 458 | case IR_UGT: return CONDFOLD((uint64_t)a > (uint64_t)b); | 458 | case IR_UGT: return CONDFOLD(a > b); |
| 459 | default: lua_assert(0); return FAILFOLD; | 459 | default: lua_assert(0); return FAILFOLD; |
| 460 | } | 460 | } |
| 461 | #else | 461 | #else |