diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 21:21:00 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-06-23 21:21:00 +0000 |
commit | e5e37ecfc2297ee70d56a00e6c12aa34eaec889e (patch) | |
tree | 4409730ec3c2bbdbb2ea3dc5beec3c1855efbfad /eval.c | |
parent | e3e359ba793459938e338944856b4db1711d637a (diff) |
* eval.c (setup_exception): "mesg == sysstack_error" and
sysstack_error_p(mesg) are duplicated.
r46502 seems to want to use latter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 24 |
1 files changed, 6 insertions, 18 deletions
@@ -492,25 +492,13 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause) file = rb_sourcefile(); if (file) line = rb_sourceline(); if (file && !NIL_P(mesg)) { - if (mesg == sysstack_error) { - ID func = rb_frame_this_func(); - at = rb_enc_sprintf(rb_usascii_encoding(), "%s:%d", file, line); - if (func) { - VALUE name = rb_id2str(func); - if (name) rb_str_catf(at, ":in `%"PRIsVALUE"'", name); - } - at = rb_ary_new3(1, at); - rb_iv_set(mesg, "bt", at); - } - else { - if (sysstack_error_p(mesg) || NIL_P(at = get_backtrace(mesg))) { - at = rb_vm_backtrace_object(); - if (OBJ_FROZEN(mesg)) { - mesg = rb_obj_dup(mesg); - } - rb_iv_set(mesg, "bt_locations", at); - set_backtrace(mesg, at); + if (sysstack_error_p(mesg) || NIL_P(at = get_backtrace(mesg))) { + at = rb_vm_backtrace_object(); + if (OBJ_FROZEN(mesg)) { + mesg = rb_obj_dup(mesg); } + rb_iv_set(mesg, "bt_locations", at); + set_backtrace(mesg, at); } } |