From a3688601487864134434e888a74b6f3a2b67ab4c Mon Sep 17 00:00:00 2001 From: ko1 Date: Mon, 11 Apr 2016 11:19:52 +0000 Subject: * vm_backtrace.c (frame2klass): filter only for imemo_ment. T_IMEMO/imemo_iseq can be passed here. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_backtrace.c | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82b6081cc4..a49612fc8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 11 20:18:43 2016 Koichi Sasada + + * vm_backtrace.c (frame2klass): filter only for imemo_ment. + T_IMEMO/imemo_iseq can be passed here. + Mon Apr 11 17:43:04 2016 Nobuyoshi Nakada * compile.c (iseq_optimize): disable tail call optimization in diff --git a/vm_backtrace.c b/vm_backtrace.c index bef61d81e0..31ca10f645 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1344,12 +1344,12 @@ frame2klass(VALUE frame) if (RB_TYPE_P(frame, T_IMEMO)) { const rb_callable_method_entry_t *cme = (rb_callable_method_entry_t *)frame; - VM_ASSERT(imemo_type(frame) == imemo_ment); - return cme->defined_class; - } - else { - return Qnil; + + if (imemo_type(frame) == imemo_ment) { + return cme->defined_class; + } } + return Qnil; } VALUE -- cgit v1.2.3