diff options
| author | Mike Pall <mike> | 2014-05-20 11:56:20 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-05-20 11:56:20 +0200 |
| commit | 945af491b6438046f6ae3560e60b000c59776a43 (patch) | |
| tree | 6f2c63c33eba504d806f0ee39b54b1889dfb01f4 /src | |
| parent | 52b081528a168c887566b59f4e0c5d68f41cee4b (diff) | |
| parent | e15765186c9e6a02cea1479e91ca6b02a23d8677 (diff) | |
| download | luajit-945af491b6438046f6ae3560e60b000c59776a43.tar.gz luajit-945af491b6438046f6ae3560e60b000c59776a43.tar.bz2 luajit-945af491b6438046f6ae3560e60b000c59776a43.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -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 77293fb5..a3af3102 100644 --- a/src/lj_opt_fold.c +++ b/src/lj_opt_fold.c | |||
| @@ -1986,7 +1986,8 @@ LJFOLDF(merge_eqne_snew_kgc) | |||
| 1986 | if (len <= FOLD_SNEW_MAX_LEN) { | 1986 | if (len <= FOLD_SNEW_MAX_LEN) { |
| 1987 | IROp op = (IROp)fins->o; | 1987 | IROp op = (IROp)fins->o; |
| 1988 | IRRef strref = fleft->op1; | 1988 | IRRef strref = fleft->op1; |
| 1989 | lua_assert(IR(strref)->o == IR_STRREF); | 1989 | if (IR(strref)->o != IR_STRREF) |
| 1990 | return NEXTFOLD; | ||
| 1990 | if (op == IR_EQ) { | 1991 | if (op == IR_EQ) { |
| 1991 | emitir(IRTGI(IR_EQ), fleft->op2, lj_ir_kint(J, len)); | 1992 | emitir(IRTGI(IR_EQ), fleft->op2, lj_ir_kint(J, len)); |
| 1992 | /* Caveat: fins/fleft/fright is no longer valid after emitir. */ | 1993 | /* Caveat: fins/fleft/fright is no longer valid after emitir. */ |