gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-08 07:34:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2014-05-12 14:36:28 +02:00
commit 159cfd63f5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lj_err.c
View File

@ -519,12 +519,14 @@ static ptrdiff_t finderrfunc(lua_State *L)
case FRAME_C: case FRAME_C:
cf = cframe_prev(cf); cf = cframe_prev(cf);
/* fallthrough */ /* fallthrough */
case FRAME_VARG:
frame = frame_prevd(frame);
break;
case FRAME_CONT: case FRAME_CONT:
#if LJ_HASFFI #if LJ_HASFFI
if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK) if ((frame-1)->u32.lo == LJ_CONT_FFI_CALLBACK)
cf = cframe_prev(cf); cf = cframe_prev(cf);
#endif #endif
case FRAME_VARG:
frame = frame_prevd(frame); frame = frame_prevd(frame);
break; break;
case FRAME_CP: case FRAME_CP: