From def18ca59dce941a3c7ed776f14fc273eb987800 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 11 Nov 2016 00:08:41 +0000 Subject: [PATCH] vm_eval.c: reorder * vm_eval.c (vm_call0_body): reorder the conditions. [ruby-core:78073] [Bug #12920] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/vm_eval.c b/vm_eval.c index 807d560741..ea398e04d2 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -196,15 +196,13 @@ vm_call0_body(rb_thread_t* th, struct rb_calling_info *calling, const struct rb_ const rb_method_type_t type = cc->me->def->type; VALUE super_class = cc->me->defined_class; - if (type == VM_METHOD_TYPE_REFINED) { - if (cc->me->def->body.refined.orig_me) { - cc->me = refined_method_callable_without_refinement(cc->me); - goto again; - } - } - else { + if (type == VM_METHOD_TYPE_ZSUPER) { super_class = RCLASS_ORIGIN(super_class); } + else if (cc->me->def->body.refined.orig_me) { + cc->me = refined_method_callable_without_refinement(cc->me); + goto again; + } super_class = RCLASS_SUPER(super_class);