[Truffle] Handle the case where 'to_str' returns something other than…

… a RubyString.
jruby · Dec 5, 2014 · e29effb · e29effb
1 parent 8e54c7d
commit e29effb
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -509,10 +509,10 @@ public Object eval(RubyString source, RubyBinding binding) {
         public Object eval(VirtualFrame frame, RubyBasicObject object, UndefinedPlaceholder binding) {
             notDesignedForCompilation();
 
-            try {
-                RubyString coerced = (RubyString) toStr.call(frame, object, "to_str", null);
+            Object coerced;
 
-                return getContext().eval(coerced.toString(), this);
+            try {
+                coerced = toStr.call(frame, object, "to_str", null);
             } catch (RaiseException e) {
                 if (e.getRubyException().getLogicalClass() == getContext().getCoreLibrary().getNoMethodErrorClass()) {
                     throw new RaiseException(
@@ -523,6 +523,24 @@ public Object eval(VirtualFrame frame, RubyBasicObject object, UndefinedPlacehol
                     throw e;
                 }
             }
+
+            if (coerced instanceof RubyString) {
+                return getContext().eval(coerced.toString(), this);
+            } else {
+                String coercedClassName = coerced.getClass().getName();
+
+                if (coerced instanceof RubyBasicObject) {
+                    coercedClassName = ((RubyBasicObject) coerced).getLogicalClass().getName();
+                }
+
+                throw new RaiseException(
+                        getContext().getCoreLibrary().typeError(
+                                String.format("can't convert %s to String (%s#to_str gives %s)",
+                                        object.getLogicalClass().getName(),
+                                        object.getLogicalClass().getName(),
+                                        coercedClassName),
+                                this));
+            }
         }
     }