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

Author: nirvdrum

spec/ruby/core/queue/initialize_spec.rb

@@ -22,16 +22,29 @@
       q.should.empty?
     end
 
-    it "uses #to_a on the provided Enumerable" do
-      enumerable = MockObject.new('mock-enumerable')
-      enumerable.should_receive(:to_a).and_return([1, 2, 3])
-      q = Queue.new(enumerable)
-      q.size.should == 3
-      q.should_not.empty?
-      q.pop.should == 1
-      q.pop.should == 2
-      q.pop.should == 3
-      q.should.empty?
+    describe "converts the given argument to an Array using #to_a" do
+      it "uses #to_a on the provided Enumerable" do
+        enumerable = MockObject.new('mock-enumerable')
+        enumerable.should_receive(:to_a).and_return([1, 2, 3])
+        q = Queue.new(enumerable)
+        q.size.should == 3
+        q.should_not.empty?
+        q.pop.should == 1
+        q.pop.should == 2
+        q.pop.should == 3
+        q.should.empty?
+      end
+
+      it "raises a TypeError if the given argument can't be converted to an Array" do
+        -> { Queue.new(42) }.should raise_error(TypeError)
+        -> { Queue.new(:abc) }.should raise_error(TypeError)
+      end
+
+      it "raises a NoMethodError if the given argument raises a NoMethodError during type coercion to an Array" do
+        enumerable = MockObject.new('mock-enumerable')
+        enumerable.should_receive(:to_a).and_raise(NoMethodError)
+        -> { Queue.new(enumerable) }.should raise_error(NoMethodError)
+      end
     end
 
     it "raises TypeError if the provided Enumerable does not respond to #to_a" do

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

@@ -13,10 +13,8 @@
 import com.oracle.truffle.api.dsl.NeverDefault;
 import com.oracle.truffle.api.dsl.NodeChild;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.profiles.BranchProfile;
 import org.truffleruby.core.array.RubyArray;
 import org.truffleruby.language.RubyBaseNodeWithExecute;
-import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
 
 // Casting of enumerable that is supposed to respond to the #to_a method to RubyArray
@@ -41,33 +39,15 @@ protected RubyArray toA(RubyArray array) {
         return array;
     }
 
-    @Specialization(guards = "!isRubyArray(enumerable)")
-    protected RubyArray toA(Object enumerable,
-            @Cached BranchProfile errorProfile,
-            @Cached DispatchNode toANode) {
-        final Object coerced;
-
-        try {
-            coerced = toANode.call(enumerable, "to_a");
-        } catch (RaiseException e) {
-            errorProfile.enter();
-            if (e.getException().getLogicalClass() == coreLibrary().noMethodErrorClass) {
-                throw new RaiseException(
-                        getContext(),
-                        coreExceptions().typeErrorCantConvertInto(enumerable, "Array", this));
-            } else {
-                throw e;
-            }
-        }
-
-        if (!(coerced instanceof RubyArray)) {
-            errorProfile.enter();
-            throw new RaiseException(
-                    getContext(),
-                    coreExceptions().typeErrorCantConvertTo(enumerable, "Array", "to_a", coerced, this));
-        }
-
-        return (RubyArray) coerced;
+    @Specialization(guards = "!isRubyArray(object)")
+    protected RubyArray coerceObject(Object object,
+            @Cached DispatchNode toAryNode) {
+        return (RubyArray) toAryNode.call(
+                coreLibrary().truffleTypeModule,
+                "rb_convert_type",
+                object,
+                coreLibrary().arrayClass,
+                coreSymbols().TO_A);
     }
 
     @Override