[GR-19220] Fix Float#<=> for immutable objects (#2432)

PullRequest: truffleruby/2891

Author: bjfish

CHANGELOG.md

@@ -21,6 +21,7 @@ Bug fixes:
 * Fix issue with `strspn` used in the `date` C extension compiled as a macro on older glibc and then missing the `__strspn_c1` symbol on newer glibc (#2406).
 * Fix constant lookup when loading the same file multiple times (#2408).
 * Fix handling of `break`, `next` and `redo` in `define_method(name, &block)` methods (#2418).
+* Fix handling of incompatible types in `Float#<=>` (#2432, @chrisseaton).
 
 Compatibility:
 

spec/ruby/core/float/comparison_spec.rb

@@ -14,6 +14,9 @@
 
   it "returns nil when the given argument is not a Float" do
     (1.0 <=> "1").should be_nil
+    (1.0 <=> "1".freeze).should be_nil
+    (1.0 <=> :one).should be_nil
+    (1.0 <=> true).should be_nil
   end
 
   it "compares using #coerce when argument is not a Float" do

src/main/java/org/truffleruby/core/numeric/FloatNodes.java

@@ -32,7 +32,6 @@
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringNodes;
 import org.truffleruby.core.string.StringUtils;
-import org.truffleruby.language.Nil;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.Visibility;
 import org.truffleruby.language.control.RaiseException;
@@ -414,14 +413,8 @@ protected int compare(double a, double b) {
             return Double.compare(a, b);
         }
 
-        @Specialization(guards = { "!isNaN(a)", "!isRubyBignum(b)" })
-        protected Object compare(double a, RubyDynamicObject b,
-                @Cached DispatchNode redoCompare) {
-            return redoCompare.call(a, "redo_compare_bad_coerce_return_error", b);
-        }
-
-        @Specialization(guards = { "!isNaN(a)" })
-        protected Object compare(double a, Nil b,
+        @Specialization(guards = { "!isNaN(a)", "!isRubyNumber(b)" })
+        protected Object compare(double a, Object b,
                 @Cached DispatchNode redoCompare) {
             return redoCompare.call(a, "redo_compare_bad_coerce_return_error", b);
         }