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

1 files changed, 1 insertions, 1 deletions

diff --git a/vm_eval.c b/vm_eval.c
index 20d7c920d6..aea00e2f5c 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -52,7 +52,7 @@ vm_call0(rb_thread_t * th, VALUE klass, VALUE recv, VALUE id, ID oid,
 	    *reg_cfp->sp++ = argv[i];
 	}
 
-	vm_setup_method(th, reg_cfp, argc, blockptr, 0, iseqval, recv, klass);
+	vm_setup_method(th, reg_cfp, argc, blockptr, 0, iseqval, recv);
 	val = vm_exec(th);
 	break;
       }