diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-06 12:18:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-06 12:18:10 +0000 |
commit | 281e4b611f68cb5d0d6e42fa50cb491a5b54a832 (patch) | |
tree | 5c7d545ffdf639b6c7b831442dd37b038961b9f3 /vm_eval.c | |
parent | 906b2110d91a8e7c2319d8d4aa5fa797919fecf2 (diff) | |
download | ruby-281e4b611f68cb5d0d6e42fa50cb491a5b54a832.tar.gz |
vm_eval.c: check exceptional condition first
* vm_eval.c (vm_call_super): check exceptional condition first.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -160,14 +160,12 @@ vm_call_super(rb_thread_t *th, int argc, const VALUE *argv) rb_method_entry_t *me; rb_control_frame_t *cfp = th->cfp; - if (!cfp->iseq && !NIL_P(cfp->klass)) { - klass = RCLASS_SUPER(cfp->klass); - id = cfp->me->def->original_id; - } - else { + if (cfp->iseq || NIL_P(cfp->klass)) { rb_bug("vm_call_super: should not be reached"); } + klass = RCLASS_SUPER(cfp->klass); + id = cfp->me->def->original_id; me = rb_method_entry(klass, id, &klass); if (!me) { return method_missing(recv, id, argc, argv, NOEX_SUPER); |