Refactor Kernel#respond_to? specializations

CHANGELOG.md

@@ -5,6 +5,8 @@ New features:
 
 Bug fixes:
 
+* Fix error message when the method name is not a Symbol or String for `Kernel#respond_to?` (#2132, @ssnickolay)
+
 
 Compatibility:
 

spec/ruby/core/kernel/respond_to_spec.rb

@@ -25,7 +25,7 @@
   end
 
   it "throws a type error if argument can't be coerced into a Symbol" do
-    -> { @a.respond_to?(Object.new) }.should raise_error(TypeError)
+    -> { @a.respond_to?(Object.new) }.should raise_error(TypeError, /is not a symbol nor a string/)
   end
 
   it "returns false if obj responds to the given protected method" do
@@ -69,5 +69,4 @@ class KernelSpecs::Foo; def bar; 'done'; end; end
     KernelSpecs::Foo.new.respond_to?(:bar).should == true
     KernelSpecs::Foo.new.respond_to?(:invalid_and_silly_method_name).should == false
   end
-
 end

src/main/java/org/truffleruby/core/exception/CoreExceptions.java

@@ -504,6 +504,14 @@ public RubyException typeErrorIsNotA(String value, String expectedType, Node cur
         return typeError(value + " is not a " + expectedType, currentNode);
     }
 
+    @TruffleBoundary
+    public RubyException typeErrorIsNotAOrB(Object value, String expectedTypeA, String expectedTypeB,
+            Node currentNode) {
+        return typeError(
+                StringUtils.format("%s is not a %s nor a %s", inspectReceiver(value), expectedTypeA, expectedTypeB),
+                currentNode);
+    }
+
     @TruffleBoundary
     public RubyException typeErrorIsNotAClassModule(Object value, Node currentNode) {
         return typeError(inspectReceiver(value) + " is not a class/module", currentNode);

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -46,6 +46,7 @@
 import org.truffleruby.core.cast.DurationToMillisecondsNodeGen;
 import org.truffleruby.core.cast.NameToJavaStringNode;
 import org.truffleruby.core.cast.ToStringOrSymbolNodeGen;
+import org.truffleruby.core.cast.ToSymbolNode;
 import org.truffleruby.core.exception.GetBacktraceException;
 import org.truffleruby.core.format.BytesResult;
 import org.truffleruby.core.format.FormatExceptionTranslator;
@@ -1584,38 +1585,20 @@ protected RubyNode coerceToBoolean(RubyNode includeProtectedAndPrivate) {
         }
 
         @Specialization
-        protected boolean doesRespondToString(
+        protected boolean doesRespondTo(
                 VirtualFrame frame,
                 Object object,
-                RubyString name,
+                Object name,
                 boolean includeProtectedAndPrivate,
-                @Cached ToJavaStringNode toJavaString) {
-            final boolean ret;
-            useCallerRefinements(frame);
-
-            if (ignoreVisibilityProfile.profile(includeProtectedAndPrivate)) {
-                ret = dispatchIgnoreVisibility.execute(frame, object, toJavaString.executeToJavaString(name));
-            } else {
-                ret = dispatch.execute(frame, object, toJavaString.executeToJavaString(name));
-            }
-
-            if (isTrueProfile.profile(ret)) {
-                return true;
-            } else if (respondToMissingProfile
-                    .profile(dispatchRespondToMissing.execute(frame, object, "respond_to_missing?"))) {
-                return respondToMissing(object, getSymbol(name.rope), includeProtectedAndPrivate);
-            } else {
-                return false;
+                @Cached ConditionProfile notSymbolOrStringProfile,
+                @Cached ToJavaStringNode toJavaString,
+                @Cached ToSymbolNode toSymbolNode) {
+            if (notSymbolOrStringProfile.profile(!RubyGuards.isRubySymbolOrString(name))) {
+                throw new RaiseException(
+                        getContext(),
+                        coreExceptions().typeErrorIsNotAOrB(object, "symbol", "string", this));
             }
-        }
 
-        @Specialization
-        protected boolean doesRespondToSymbol(
-                VirtualFrame frame,
-                Object object,
-                RubySymbol name,
-                boolean includeProtectedAndPrivate,
-                @Cached ToJavaStringNode toJavaString) {
             final boolean ret;
             useCallerRefinements(frame);
 
@@ -1629,7 +1612,7 @@ protected boolean doesRespondToSymbol(
                 return true;
             } else if (respondToMissingProfile
                     .profile(dispatchRespondToMissing.execute(frame, object, "respond_to_missing?"))) {
-                return respondToMissing(object, name, includeProtectedAndPrivate);
+                return respondToMissing(object, toSymbolNode.execute(name), includeProtectedAndPrivate);
             } else {
                 return false;
             }