diff options
| author | Mike Pall <mike> | 2014-02-20 15:09:02 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-02-20 15:09:02 +0100 |
| commit | 2863b1095699404693a50082dd8d19b6c4cad99f (patch) | |
| tree | 4c4626f4b8a342773fdd961f46eb39dc43616e5e /src/lj_record.c | |
| parent | 46ce03464b67935fb84ace1d0710a7f3cc62e132 (diff) | |
| parent | 998651fcdafc8b6f3d922e1e60864fec83409118 (diff) | |
| download | luajit-2863b1095699404693a50082dd8d19b6c4cad99f.tar.gz luajit-2863b1095699404693a50082dd8d19b6c4cad99f.tar.bz2 luajit-2863b1095699404693a50082dd8d19b6c4cad99f.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_record.c')
| -rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 650763fe..5bd2d5db 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -764,7 +764,7 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults) | |||
| 764 | (J->parent == 0 && J->exitno == 0 && | 764 | (J->parent == 0 && J->exitno == 0 && |
| 765 | !bc_isret(bc_op(J->cur.startins))))) { | 765 | !bc_isret(bc_op(J->cur.startins))))) { |
| 766 | /* NYI: specialize to frame type and return directly, not via RET*. */ | 766 | /* NYI: specialize to frame type and return directly, not via RET*. */ |
| 767 | for (i = -1; i < (ptrdiff_t)rbase; i++) | 767 | for (i = 0; i < (ptrdiff_t)rbase; i++) |
| 768 | J->base[i] = 0; /* Purge dead slots. */ | 768 | J->base[i] = 0; /* Purge dead slots. */ |
| 769 | J->maxslot = rbase + (BCReg)gotresults; | 769 | J->maxslot = rbase + (BCReg)gotresults; |
| 770 | lj_record_stop(J, LJ_TRLINK_RETURN, 0); /* Return to interpreter. */ | 770 | lj_record_stop(J, LJ_TRLINK_RETURN, 0); /* Return to interpreter. */ |