Fix the exception type raised when type coercion via to_f raises a NoMethodError.

Author: nirvdrum

spec/ruby/core/math/cos_spec.rb

@@ -15,7 +15,6 @@
     Math.cos(2*Math::PI).should be_close(1.0, TOLERANCE)
   end
 
-
   it "raises a TypeError unless the argument is Numeric and has #to_f" do
     -> { Math.cos("test") }.should raise_error(TypeError)
   end
@@ -24,14 +23,23 @@
     Math.cos(nan_value).nan?.should be_true
   end
 
-  it "raises a TypeError if the argument is nil" do
-    -> { Math.cos(nil) }.should raise_error(TypeError)
-  end
-
-  it "coerces its argument with #to_f" do
-    f = mock_numeric('8.2')
-    f.should_receive(:to_f).and_return(8.2)
-    Math.cos(f).should == Math.cos(8.2)
+  describe "coerces its argument with #to_f" do
+    it "coerces its argument with #to_f" do
+      f = mock_numeric('8.2')
+      f.should_receive(:to_f).and_return(8.2)
+      Math.cos(f).should == Math.cos(8.2)
+    end
+
+    it "raises a TypeError if the given argument can't be converted to a Float" do
+      -> { Math.cos(nil) }.should raise_error(TypeError)
+      -> { Math.cos(:abc) }.should raise_error(TypeError)
+    end
+
+    it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to a Float" do
+      object = mock_numeric('mock-float')
+      object.should_receive(:to_f).and_raise(NoMethodError)
+      -> { Math.cos(object) }.should raise_error(NoMethodError)
+    end
   end
 end
 

src/main/java/org/truffleruby/core/cast/ToFNode.java

@@ -10,17 +10,13 @@
 
 package org.truffleruby.core.cast;
 
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Specialization;
 import org.truffleruby.core.numeric.BigIntegerOps;
 import org.truffleruby.core.numeric.RubyBignum;
 import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.profiles.BranchProfile;
-
 public abstract class ToFNode extends RubyBaseNode {
 
     @Child private DispatchNode toFNode;
@@ -53,34 +49,12 @@ protected double coerceRubyBignum(RubyBignum value) {
 
     @Specialization(guards = { "!isRubyBignum(object)", "!isImplicitLongOrDouble(object)" })
     protected double coerceObject(Object object,
-            @Cached BranchProfile errorProfile) {
-        if (toFNode == null) {
-            CompilerDirectives.transferToInterpreterAndInvalidate();
-            toFNode = insert(DispatchNode.create());
-        }
-
-        final Object coerced;
-        try {
-            coerced = toFNode.call(object, "to_f");
-        } catch (RaiseException e) {
-            if (e.getException().getLogicalClass() == coreLibrary().noMethodErrorClass) {
-                errorProfile.enter();
-                throw new RaiseException(
-                        getContext(),
-                        coreExceptions().typeErrorNoImplicitConversion(object, "Float", this));
-            } else {
-                throw e;
-            }
-        }
-
-        if (coerced instanceof Double) {
-            return (double) coerced;
-        } else {
-            errorProfile.enter();
-            throw new RaiseException(
-                    getContext(),
-                    coreExceptions().typeErrorBadCoercion(object, "Float", "to_f", coerced, this));
-        }
+            @Cached DispatchNode toFNode) {
+        return (double) toFNode.call(
+                coreLibrary().truffleTypeModule,
+                "rb_convert_type",
+                object,
+                coreLibrary().floatClass,
+                coreSymbols().TO_F);
     }
-
 }