From 74bbac68df669e77f1ccc5780bb1e9fc3df13d03 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 25 Dec 2008 09:55:35 +0000 Subject: merges r20967 from trunk into ruby_1_9_1. * vm_insnhelper.c (vm_call_method): use class of method defined instead of receiver's class on bmethod. fixes [ruby-core:20786] * bootstraptest/test_method.rb: add a test for above. * vm_insnhelper.c (vm_setup_method): remove unused parameter klass. * vm_insnhelper.h (CALL_METHOD): ditto. * insns.def, vm_eval.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- insns.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'insns.def') diff --git a/insns.def b/insns.def index c91147ed16..669c491ed7 100644 --- a/insns.def +++ b/insns.def @@ -996,7 +996,7 @@ send vm_send_optimize(GET_CFP(), &mn, &flag, &num, &id, klass); } - CALL_METHOD(num, blockptr, flag, id, mn, recv, klass); + CALL_METHOD(num, blockptr, flag, id, mn, recv); } /** @@ -1023,7 +1023,7 @@ invokesuper vm_search_superclass(GET_CFP(), GET_ISEQ(), recv, TOPN(num), &id, &klass); mn = rb_method_node(klass, id); - CALL_METHOD(num, blockptr, flag, id, mn, recv, klass); + CALL_METHOD(num, blockptr, flag, id, mn, recv); } /** -- cgit v1.2.3