diff options
| author | Kouhei Sutou <[email protected]> | 2016-03-06 11:51:04 +0900 |
|---|---|---|
| committer | Kouhei Sutou <[email protected]> | 2016-03-06 11:51:04 +0900 |
| commit | d77c72dac5b46dacc8332bca73a8398ae2cf9a78 (patch) | |
| tree | 2bd47e75f794b8de14ed8c7ba06e0eec39726051 /src | |
| parent | bf7719fe8da1b704c2cb72dd629dc75135fd1ad5 (diff) | |
| download | mruby-d77c72dac5b46dacc8332bca73a8398ae2cf9a78.tar.gz mruby-d77c72dac5b46dacc8332bca73a8398ae2cf9a78.zip | |
Revert "Merge pull request #3126 from jbreeden/backtrace_irep_null_check"
This reverts commit bf7719fe8da1b704c2cb72dd629dc75135fd1ad5, reversing
changes made to 4f4fa0ade0fd80a3a6fa64bebcb5f71b0d4a8648.
We should get backtrace while irep is alive.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backtrace.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/backtrace.c b/src/backtrace.c index 5bf6d3196..45a8cc2de 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -111,8 +111,6 @@ each_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, each_backtrace_func mrb_callinfo *ci; mrb_irep *irep; mrb_code *pc; - - loc.lineno = -1; ci = &mrb->c->cibase[i]; @@ -130,11 +128,8 @@ each_backtrace(mrb_state *mrb, mrb_int ciidx, mrb_code *pc0, each_backtrace_func else { pc = pc0; } - - if (irep) { - loc.filename = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq)); - loc.lineno = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq)); - } + loc.filename = mrb_debug_get_filename(irep, (uint32_t)(pc - irep->iseq)); + loc.lineno = mrb_debug_get_line(irep, (uint32_t)(pc - irep->iseq)); if (loc.lineno == -1) continue; |