admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6221 from dearblue/arrange-each_backtrace

Browse Source 
Arranging `each_backtrace()`
This commit is contained in:
Yukihiro "Matz" Matsumoto
2024-03-31 21:44:56 +09:00
committed by GitHub
parent 586ce04cee 9b8b864be1
commit 4982999e07
1 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backtrace.c
+11 -21
View File
@@ -45,42 +45,32 @@ pack_backtrace(mrb_state *mrb, ptrdiff_t ciidx, struct mrb_backtrace_location *p
const mrb_code *pc;
ci = &mrb->c->cibase[i];
loc.method_id = ci->mid;
if (!ci->proc || MRB_PROC_CFUNC_P(ci->proc)) {
if (!ci->mid) continue;
loc.irep = NULL;
}
else {
if (ci->proc && !MRB_PROC_CFUNC_P(ci->proc)) {
mrb_assert(!MRB_PROC_ALIAS_P(ci->proc));
loc.irep = ci->proc->body.irep;
if (!loc.irep) continue;
if (!loc.irep->debug_info) continue;
if (mrb->c->cibase[i].pc) {
pc = &mrb->c->cibase[i].pc[-1];
}
else {
continue;
}
if (!ci->pc) continue;
pc = &ci->pc[-1];
loc.idx = (uint32_t)(pc - loc.irep->iseq);
}
loc.method_id = ci->mid;
if (loc.irep == NULL) {
else {
if (!loc.method_id) continue;
loc.irep = NULL;
for (ptrdiff_t j=i-1; j >= 0; j--) {
ci = &mrb->c->cibase[j];
if (!ci->proc) continue;
if (MRB_PROC_CFUNC_P(ci->proc)) continue;
mrb_assert(!MRB_PROC_ALIAS_P(ci->proc));
const mrb_irep *irep = ci->proc->body.irep;
if (!irep) continue;
if (!irep->debug_info) continue;
if (mrb->c->cibase[j].pc) {
pc = &mrb->c->cibase[j].pc[-1];
}
else {
continue;
}
if (!ci->pc) continue;
pc = &ci->pc[-1];
loc.irep = irep;
loc.idx = (uint32_t)(pc - irep->iseq);
break;