diff options
author | Mike Pall <mike> | 2014-06-12 10:58:22 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2014-06-12 10:58:22 +0200 |
commit | 5e7b9bb8ed5bd8d7fa5263acc19e0869adc87d4c (patch) | |
tree | cab2f12d87f5de895621f98e738da10cc960f9ad /src/lj_debug.c | |
parent | 7dc9e5ade487ff2cd81c0c644f4f0953166b1375 (diff) | |
download | luajit-5e7b9bb8ed5bd8d7fa5263acc19e0869adc87d4c.tar.gz luajit-5e7b9bb8ed5bd8d7fa5263acc19e0869adc87d4c.tar.bz2 luajit-5e7b9bb8ed5bd8d7fa5263acc19e0869adc87d4c.zip |
FFI: Fix frame traversal for backtraces with FFI callbacks.
Diffstat (limited to '')
-rw-r--r-- | src/lj_debug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lj_debug.c b/src/lj_debug.c index effb4841..e4ab9c12 100644 --- a/src/lj_debug.c +++ b/src/lj_debug.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include "lj_state.h" | 14 | #include "lj_state.h" |
15 | #include "lj_frame.h" | 15 | #include "lj_frame.h" |
16 | #include "lj_bc.h" | 16 | #include "lj_bc.h" |
17 | #include "lj_vm.h" | ||
17 | #if LJ_HASJIT | 18 | #if LJ_HASJIT |
18 | #include "lj_jit.h" | 19 | #include "lj_jit.h" |
19 | #endif | 20 | #endif |
@@ -86,7 +87,8 @@ static BCPos debug_framepc(lua_State *L, GCfunc *fn, cTValue *nextframe) | |||
86 | if (frame_islua(f)) { | 87 | if (frame_islua(f)) { |
87 | f = frame_prevl(f); | 88 | f = frame_prevl(f); |
88 | } else { | 89 | } else { |
89 | if (frame_isc(f)) | 90 | if (frame_isc(f) || (LJ_HASFFI && frame_iscont(f) && |
91 | (f-1)->u32.lo == LJ_CONT_FFI_CALLBACK)) | ||
90 | cf = cframe_raw(cframe_prev(cf)); | 92 | cf = cframe_raw(cframe_prev(cf)); |
91 | f = frame_prevd(f); | 93 | f = frame_prevd(f); |
92 | } | 94 | } |