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, 19 insertions, 0 deletions

diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index 33e7436e6e..fff484db73 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -1084,3 +1084,22 @@ assert_equal '[1, [:foo, 3, 4, :foo]]', %q{
   a = b = [:foo]
   regular(1, *a, *[3, 4], *b)
 }
+
+assert_equal '["B", "A"]', %q{
+  class A
+    def m
+      'A'
+    end
+  end
+
+  class B < A
+    define_method(:m) do    
+      ['B', super()]
+    end
+  end
+
+  class C < B
+  end
+
+  C.new.m
+}