diff --git a/proc.c b/proc.c index c284d4fcabb02f..9fd24a8fd4e561 100644 --- a/proc.c +++ b/proc.c @@ -2096,10 +2096,9 @@ rb_obj_singleton_method(VALUE obj, VALUE vid) VALUE klass = rb_singleton_class_get(obj); ID id = rb_check_id(&vid); - if (NIL_P(klass)) { - /* goto undef; */ - } - else if (NIL_P(klass = RCLASS_ORIGIN(klass))) { + if (NIL_P(klass) || + NIL_P(klass = RCLASS_ORIGIN(klass)) || + !NIL_P(rb_special_singleton_class(obj))) { /* goto undef; */ } else if (! id) { diff --git a/spec/ruby/core/false/singleton_method_spec.rb b/spec/ruby/core/false/singleton_method_spec.rb new file mode 100644 index 00000000000000..6cf29af411bdef --- /dev/null +++ b/spec/ruby/core/false/singleton_method_spec.rb @@ -0,0 +1,15 @@ +require_relative '../../spec_helper' + +describe "FalseClass#singleton_method" do + ruby_version_is '3.3' do + it "raises regardless of whether FalseClass defines the method" do + proc{false.singleton_method(:foo)}.should raise_error(NameError) + begin + def false.foo; end + proc{false.singleton_method(:foo)}.should raise_error(NameError) + ensure + FalseClass.send(:remove_method, :foo) + end + end + end +end diff --git a/spec/ruby/core/nil/singleton_method_spec.rb b/spec/ruby/core/nil/singleton_method_spec.rb new file mode 100644 index 00000000000000..f9163da3f15393 --- /dev/null +++ b/spec/ruby/core/nil/singleton_method_spec.rb @@ -0,0 +1,15 @@ +require_relative '../../spec_helper' + +describe "NilClass#singleton_method" do + ruby_version_is '3.3' do + it "raises regardless of whether NilClass defines the method" do + proc{nil.singleton_method(:foo)}.should raise_error(NameError) + begin + def nil.foo; end + proc{nil.singleton_method(:foo)}.should raise_error(NameError) + ensure + NilClass.send(:remove_method, :foo) + end + end + end +end diff --git a/spec/ruby/core/true/singleton_method_spec.rb b/spec/ruby/core/true/singleton_method_spec.rb new file mode 100644 index 00000000000000..f765054c5f38fb --- /dev/null +++ b/spec/ruby/core/true/singleton_method_spec.rb @@ -0,0 +1,15 @@ +require_relative '../../spec_helper' + +describe "TrueClass#singleton_method" do + ruby_version_is '3.3' do + it "raises regardless of whether TrueClass defines the method" do + proc{true.singleton_method(:foo)}.should raise_error(NameError) + begin + def true.foo; end + proc{true.singleton_method(:foo)}.should raise_error(NameError) + ensure + TrueClass.send(:remove_method, :foo) + end + end + end +end