diff options
| author | Mike Pall <mike> | 2014-05-12 14:36:28 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-05-12 14:36:28 +0200 |
| commit | 159cfd63f5b72f283391e7729609daabe7707472 (patch) | |
| tree | d5a7829cc1fba2cdf3fad26faa8493496e8c24cb /src | |
| parent | 392b6c94ae4b969f7fc74b21501b5e884c002892 (diff) | |
| parent | 624260f8318e0a64f4a128f0111a974230d5cb48 (diff) | |
| download | luajit-159cfd63f5b72f283391e7729609daabe7707472.tar.gz luajit-159cfd63f5b72f283391e7729609daabe7707472.tar.bz2 luajit-159cfd63f5b72f283391e7729609daabe7707472.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_err.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index 74b73301..d37df310 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -519,12 +519,14 @@ static ptrdiff_t finderrfunc(lua_State *L) | |||
| 519 | case FRAME_C: | 519 | case FRAME_C: |
| 520 | cf = cframe_prev(cf); | 520 | cf = cframe_prev(cf); |
| 521 | /* fallthrough */ | 521 | /* fallthrough */ |
| 522 | case FRAME_VARG: | ||
| 523 | frame = frame_prevd(frame); | ||
| 524 | break; | ||
| 522 | case FRAME_CONT: | 525 | case FRAME_CONT: |
| 523 | #if LJ_HASFFI | 526 | #if LJ_HASFFI |
| 524 | if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK) | 527 | if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK) |
| 525 | cf = cframe_prev(cf); | 528 | cf = cframe_prev(cf); |
| 526 | #endif | 529 | #endif |
| 527 | case FRAME_VARG: | ||
| 528 | frame = frame_prevd(frame); | 530 | frame = frame_prevd(frame); |
| 529 | break; | 531 | break; |
| 530 | case FRAME_CP: | 532 | case FRAME_CP: |