nobu	2018-12-31 06:42:52 +0900 (Mon, 31 Dec 2018)

  New Revision: 66658

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66658

  Log:
    vm_args.c: search symbol proc in super classes
    
    * vm_args.c (refine_sym_proc_call): traverse ancestors to search
      inherited methods for symbol proc.
      [ruby-dev:50741] [Bug #15489]

  Modified files:
    trunk/test/ruby/test_symbol.rb
    trunk/vm_args.c
Index: vm_args.c
===================================================================
--- vm_args.c	(revision 66657)
+++ vm_args.c	(revision 66658)
@@ -853,6 +853,7 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ https://github.com/ruby/ruby/blob/trunk/vm_args.c#L853
     rb_execution_context_t *ec;
     const VALUE symbol = RARRAY_AREF(callback_arg, 0);
     const VALUE refinements = RARRAY_AREF(callback_arg, 1);
+    VALUE klass;
 
     if (argc-- < 1) {
 	rb_raise(rb_eArgError, "no receiver given");
@@ -860,8 +861,13 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ https://github.com/ruby/ruby/blob/trunk/vm_args.c#L861
     obj = *argv++;
 
     mid = SYM2ID(symbol);
-    me = rb_callable_method_entry(CLASS_OF(obj), mid);
-    me = rb_resolve_refined_method_callable(refinements, me);
+    for (klass = CLASS_OF(obj); klass; klass = RCLASS_SUPER(klass)) {
+        me = rb_callable_method_entry(klass, mid);
+        if (me) {
+            me = rb_resolve_refined_method_callable(refinements, me);
+            if (me) break;
+        }
+    }
 
     ec = GET_EC();
     if (!NIL_P(blockarg)) {
Index: test/ruby/test_symbol.rb
===================================================================
--- test/ruby/test_symbol.rb	(revision 66657)
+++ test/ruby/test_symbol.rb	(revision 66658)
@@ -191,6 +191,12 @@ class TestSymbol < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_symbol.rb#L191
     assert_equal(:hogehoge, _test_to_proc_arg_with_refinements_call(&:hoge))
   end
 
+  def test_to_proc_arg_with_refinements_undefined
+    assert_raise(NoMethodError) do
+      _test_to_proc_arg_with_refinements_call(&:foo)
+    end
+  end
+
   private def return_from_proc
     Proc.new { return 1 }.tap(&:call)
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/