diff options
| author | Mike Pall <mike> | 2016-06-03 04:28:17 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-06-03 04:28:17 +0200 |
| commit | 1c0454c6cea77764d0294c4698acaff945402cf3 (patch) | |
| tree | 9dddec89cb5b7c8e6478aa106816608dd579eb85 | |
| parent | 384ce2f9eff0322eca76a26fdaadd5840043710a (diff) | |
| parent | a5f8a4819f21ddb9aa0fb4ddd3c221d4512968e9 (diff) | |
| download | luajit-1c0454c6cea77764d0294c4698acaff945402cf3.tar.gz luajit-1c0454c6cea77764d0294c4698acaff945402cf3.tar.bz2 luajit-1c0454c6cea77764d0294c4698acaff945402cf3.zip | |
Merge branch 'master' into v2.1
| -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 3c67e1a0..76699a9f 100644 --- a/src/lj_record.c +++ b/src/lj_record.c | |||
| @@ -789,7 +789,7 @@ void lj_record_ret(jit_State *J, BCReg rbase, ptrdiff_t gotresults) | |||
| 789 | (void)getslot(J, rbase+i); /* Ensure all results have a reference. */ | 789 | (void)getslot(J, rbase+i); /* Ensure all results have a reference. */ |
| 790 | while (frame_ispcall(frame)) { /* Immediately resolve pcall() returns. */ | 790 | while (frame_ispcall(frame)) { /* Immediately resolve pcall() returns. */ |
| 791 | BCReg cbase = (BCReg)frame_delta(frame); | 791 | BCReg cbase = (BCReg)frame_delta(frame); |
| 792 | if (--J->framedepth < 0) | 792 | if (--J->framedepth <= 0) |
| 793 | lj_trace_err(J, LJ_TRERR_NYIRETL); | 793 | lj_trace_err(J, LJ_TRERR_NYIRETL); |
| 794 | lua_assert(J->baseslot > 1+LJ_FR2); | 794 | lua_assert(J->baseslot > 1+LJ_FR2); |
| 795 | gotresults++; | 795 | gotresults++; |