diff options
| author | YAMAMOTO Masaya <[email protected]> | 2017-11-04 01:23:12 +0900 |
|---|---|---|
| committer | YAMAMOTO Masaya <[email protected]> | 2017-11-04 01:23:12 +0900 |
| commit | 625f9f6fa314872968632c5adbee7fb3823268b8 (patch) | |
| tree | fdde1700b13048212606e4a995907f3757e18e2f /src/backtrace.c | |
| parent | b70d69de09130ce2bc89289b4826b3deea8afaae (diff) | |
| parent | e7fe6ee2638dee438c1d79ab16a0403aebec0a60 (diff) | |
| download | mruby-625f9f6fa314872968632c5adbee7fb3823268b8.tar.gz mruby-625f9f6fa314872968632c5adbee7fb3823268b8.zip | |
Merge branch 'master' of github.com:mruby/mruby
Diffstat (limited to 'src/backtrace.c')
| -rw-r--r-- | src/backtrace.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backtrace.c b/src/backtrace.c index 232d1c2f4..f2cf2cd0f 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -51,7 +51,7 @@ each_backtrace(mrb_state *mrb, ptrdiff_t ciidx, mrb_code *pc0, each_backtrace_fu pc = mrb->c->cibase[i].err; } else if (i+1 <= ciidx) { - pc = mrb->c->cibase[i+1].pc - 1; + pc = &mrb->c->cibase[i+1].pc[-1]; } else { pc = pc0; @@ -215,11 +215,14 @@ packed_backtrace(mrb_state *mrb) void mrb_keep_backtrace(mrb_state *mrb, mrb_value exc) { + mrb_sym sym = mrb_intern_lit(mrb, "backtrace"); mrb_value backtrace; - int ai = mrb_gc_arena_save(mrb); + int ai; + if (mrb_iv_defined(mrb, exc, sym)) return; + ai = mrb_gc_arena_save(mrb); backtrace = packed_backtrace(mrb); - mrb_iv_set(mrb, exc, mrb_intern_lit(mrb, "backtrace"), backtrace); + mrb_iv_set(mrb, exc, sym, backtrace); mrb_gc_arena_restore(mrb, ai); } |