Skip to content

M
mruby
Unverified Commit 2a717cf2 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

backtrace.c: do not skip frames for C function calls.

parent cefbc21e
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 12 deletions
src/backtrace.c
View file @ 2a717cf2
...@@ -38,15 +38,17 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void * ...@@ -38,15 +38,17 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void *
for (ptrdiff_t i=ciidx; i >= 0; i--) { for (ptrdiff_t i=ciidx; i >= 0; i--) {
struct backtrace_location loc; struct backtrace_location loc;
mrb_callinfo *ci; mrb_callinfo *ci;
const mrb_irep *irep; const mrb_irep *irep = 0;
const mrb_code *pc; const mrb_code *pc;
uint32_t idx; uint32_t idx;
ci = &mrb->c->cibase[i]; ci = &mrb->c->cibase[i];
if (!ci->proc) continue; if (!ci->proc || MRB_PROC_CFUNC_P(ci->proc)) {
if (MRB_PROC_CFUNC_P(ci->proc)) continue; loc.lineno = -1;
idx = 0;
}
else {
irep = ci->proc->body.irep; irep = ci->proc->body.irep;
if (!irep) continue; if (!irep) continue;
if (mrb->c->cibase[i].pc) { if (mrb->c->cibase[i].pc) {
...@@ -55,10 +57,10 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void * ...@@ -55,10 +57,10 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, each_backtrace_func func, void *
else { else {
continue; continue;
} }
loc.method_id = ci->mid;
idx = (uint32_t)(pc - irep->iseq); idx = (uint32_t)(pc - irep->iseq);
loc.lineno = mrb_debug_get_line(mrb, irep, idx); loc.lineno = mrb_debug_get_line(mrb, irep, idx);
}
loc.method_id = ci->mid;
if (loc.lineno == -1) { if (loc.lineno == -1) {
for (ptrdiff_t j=i-1; j >= 0; j--) { for (ptrdiff_t j=i-1; j >= 0; j--) {
ci = &mrb->c->cibase[j]; ci = &mrb->c->cibase[j];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment