diff options
| author | Mike Pall <mike> | 2013-05-24 01:32:10 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-05-24 01:32:10 +0200 |
| commit | 4c1f9dd0f7fdbf79ed62588c64417d6238fd5c51 (patch) | |
| tree | a707801d79164be931d227e00e2bcede6f355bee | |
| parent | f1f7e403182c891a356ce8813417820af19a778b (diff) | |
| parent | d686217926b75e6f93044b190943ad098d103bfe (diff) | |
| download | luajit-4c1f9dd0f7fdbf79ed62588c64417d6238fd5c51.tar.gz luajit-4c1f9dd0f7fdbf79ed62588c64417d6238fd5c51.tar.bz2 luajit-4c1f9dd0f7fdbf79ed62588c64417d6238fd5c51.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_opt_fold.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_opt_fold.c b/src/lj_opt_fold.c index f3abe8ea..1d37a7fd 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -1978,6 +1978,7 @@ LJFOLDF(merge_eqne_snew_kgc) | |||
| 1978 | #define FOLD_SNEW_TYPE8 IRT_U8 /* Prefer unsigned loads. */ | 1978 | #define FOLD_SNEW_TYPE8 IRT_U8 /* Prefer unsigned loads. */ |
| 1979 | #endif | 1979 | #endif |
| 1980 | 1980 | ||
| 1981 | PHIBARRIER(fleft); | ||
| 1981 | if (len <= FOLD_SNEW_MAX_LEN) { | 1982 | if (len <= FOLD_SNEW_MAX_LEN) { |
| 1982 | IROp op = (IROp)fins->o; | 1983 | IROp op = (IROp)fins->o; |
| 1983 | IRRef strref = fleft->op1; | 1984 | IRRef strref = fleft->op1; |