summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-06 04:14:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-06 04:14:00 +0000
commitd93d45fea7598dccab03447a19988a05e6c55ae0 (patch)
treee155639f69cfe66c1dabafb78939e342097ba087
parentcc48423ead1d9e4b46dfeca7a45437793fc29521 (diff)
vm_eval.c: remove dead code
* vm_eval.c (vm_call_super): since cfp->klass is always class or iclass, no search from method entry. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_eval.c4
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f753bb83b9..c7cf0e0595 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Mon Aug 6 11:34:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Aug 6 13:13:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_eval.c (vm_call_super): since cfp->klass is always class or
+ iclass, no search from method entry.
* insns.def (defined): now should use klass in the current control
frame to search superclass, not me->klass. reported by naruse.
diff --git a/vm_eval.c b/vm_eval.c
index 05d5d883b9..6b01cc3708 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -162,10 +162,6 @@ vm_call_super(rb_thread_t *th, int argc, const VALUE *argv)
if (!cfp->iseq && !NIL_P(cfp->klass)) {
klass = RCLASS_SUPER(cfp->klass);
-
- if (klass == 0) {
- klass = vm_search_normal_superclass(cfp->me->klass);
- }
id = cfp->me->def->original_id;
}
else {