diff options
| -rw-r--r-- | proc.c | 9 | ||||
| -rw-r--r-- | spec/ruby/core/method/shared/to_s.rb | 18 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 35 insertions, 2 deletions
@@ -2635,7 +2635,8 @@ method_inspect(VALUE method) str = rb_sprintf("#<% "PRIsVALUE": ", rb_obj_class(method)); OBJ_INFECT_RAW(str, method); - mklass = data->klass; + mklass = data->iclass; + if (!mklass) mklass = data->klass; if (data->me->def->type == VM_METHOD_TYPE_ALIAS) { defined_class = data->me->def->body.alias.original_me->owner; @@ -2667,6 +2668,12 @@ method_inspect(VALUE method) } } else { + mklass = data->klass; + if (FL_TEST(mklass, FL_SINGLETON)) { + do { + mklass = RCLASS_SUPER(mklass); + } while (RB_TYPE_P(mklass, T_ICLASS)); + } rb_str_buf_append(str, rb_inspect(mklass)); if (defined_class != mklass) { rb_str_catf(str, "(% "PRIsVALUE")", defined_class); diff --git a/spec/ruby/core/method/shared/to_s.rb b/spec/ruby/core/method/shared/to_s.rb index 373398a785..7666322936 100644 --- a/spec/ruby/core/method/shared/to_s.rb +++ b/spec/ruby/core/method/shared/to_s.rb @@ -31,4 +31,22 @@ describe :method_to_s, shared: true do it "returns a String containing the Module the method is referenced from" do @string.should =~ /MethodSpecs::MySub/ end + + ruby_version_is '2.8' do + it "returns a String containing the Module containing the method if object has a singleton class but method is not defined in the singleton class" do + obj = MethodSpecs::MySub.new + obj.singleton_class + @m = obj.method(:bar) + @string = @m.send(@method).sub(/0x\w+/, '0xXXXXXX') + @string.should =~ /\A#<Method: MethodSpecs::MySub\(MethodSpecs::MyMod\)#bar\(\) / + end + end + + it "returns a String containing the singleton class if method is defined in the singleton class" do + obj = MethodSpecs::MySub.new + def obj.bar; end + @m = obj.method(:bar) + @string = @m.send(@method).sub(/0x\w+/, '0xXXXXXX') + @string.should =~ /\A#<Method: #<MethodSpecs::MySub:0xXXXXXX>\.bar/ + end end diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 3a7186584a..2d615ca53f 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -458,6 +458,14 @@ class TestMethod < Test::Unit::TestCase m.taint assert_predicate(m.inspect, :tainted?, "inspect result should be infected") + + bug15608 = '[ruby-core:91570] [Bug #15608]' + c4 = Class.new(c) + c4.class_eval { alias bar foo } + o = c4.new + o.singleton_class + m4 = o.method(:bar) + assert_equal("#<Method: #{c4.inspect}(#{c.inspect})#bar(foo)>", m4.inspect, bug15608) end def test_callee_top_level @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.7" #define RUBY_RELEASE_DATE "2021-02-28" -#define RUBY_PATCHLEVEL 161 +#define RUBY_PATCHLEVEL 162 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 2 |