diff options
| author | Mike Pall <mike> | 2013-09-14 12:56:37 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-09-14 12:56:37 +0200 |
| commit | 8201fda2fc4f43856a27607b4784e9b09fd3ccb4 (patch) | |
| tree | 5b42cb5648c06982d9c2cab3e7759b321c53e2c4 | |
| parent | da1456584b99ee9e05c3134e2168b2191d9b72d0 (diff) | |
| parent | 474bb21af18505c0bdb47a383188d10ea0157fa5 (diff) | |
| download | luajit-8201fda2fc4f43856a27607b4784e9b09fd3ccb4.tar.gz luajit-8201fda2fc4f43856a27607b4784e9b09fd3ccb4.tar.bz2 luajit-8201fda2fc4f43856a27607b4784e9b09fd3ccb4.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_opt_fold.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index 84c5dc00..9c00f7e7 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -1858,7 +1858,8 @@ LJFOLDF(abc_k) | |||
| 1858 | LJFOLD(ABC any any) | 1858 | LJFOLD(ABC any any) |
| 1859 | LJFOLDF(abc_invar) | 1859 | LJFOLDF(abc_invar) |
| 1860 | { | 1860 | { |
| 1861 | if (!irt_isint(fins->t) && J->chain[IR_LOOP]) /* Currently marked as PTR. */ | 1861 | /* Invariant ABC marked as PTR. Drop if op1 is invariant, too. */ |
| 1862 | if (!irt_isint(fins->t) && fins->op1 < J->chain[IR_LOOP]) | ||
| 1862 | return DROPFOLD; | 1863 | return DROPFOLD; |
| 1863 | return NEXTFOLD; | 1864 | return NEXTFOLD; |
| 1864 | } | 1865 | } |