diff options
| author | Mike Pall <mike> | 2014-02-28 14:10:30 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-02-28 14:10:30 +0100 |
| commit | fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b (patch) | |
| tree | ff147bd8135c2c9c8e4aec70687d4724a7de99a0 /src/lj_record.c | |
| parent | b342b7a0ebe9ba52d7c9a148809e75e797459eae (diff) | |
| parent | e94150877da95140db47a4e58e14cc9000be273c (diff) | |
| download | luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.tar.gz luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.tar.bz2 luajit-fd3354a9dd3c8614ed4c5d7db048feb3ec89bd7b.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_record.c')
| -rw-r--r-- | src/lj_record.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index 5bd2d5db..9a3e3375 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -1603,10 +1603,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults) | |||
| 1603 | } else if (dst + nresults > J->maxslot) { | 1603 | } else if (dst + nresults > J->maxslot) { |
| 1604 | J->maxslot = dst + (BCReg)nresults; | 1604 | J->maxslot = dst + (BCReg)nresults; |
| 1605 | } | 1605 | } |
| 1606 | for (i = 0; i < nresults; i++) { | 1606 | for (i = 0; i < nresults; i++) |
| 1607 | J->base[dst+i] = i < nvararg ? J->base[i - nvararg - 1] : TREF_NIL; | 1607 | J->base[dst+i] = i < nvararg ? getslot(J, i - nvararg - 1) : TREF_NIL; |
| 1608 | lua_assert(J->base[dst+i] != 0); | ||
| 1609 | } | ||
| 1610 | } else { /* Unknown number of varargs passed to trace. */ | 1608 | } else { /* Unknown number of varargs passed to trace. */ |
| 1611 | TRef fr = emitir(IRTI(IR_SLOAD), 0, IRSLOAD_READONLY|IRSLOAD_FRAME); | 1609 | TRef fr = emitir(IRTI(IR_SLOAD), 0, IRSLOAD_READONLY|IRSLOAD_FRAME); |
| 1612 | int32_t frofs = 8*(1+numparams)+FRAME_VARG; | 1610 | int32_t frofs = 8*(1+numparams)+FRAME_VARG; |