[Truffle] Handle #to_s on String subclasses.

jruby · Mar 6, 2015 · 7fdec90 · 7fdec90
1 parent a6fc17e
commit 7fdec90
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/string/to_s_tags.txt b/spec/truffle/tags/core/string/to_s_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -1727,10 +1727,20 @@ public ToSNode(ToSNode prev) {
             super(prev);
         }
 
-        @Specialization
+        @Specialization(guards = "!isStringSubclass")
         public RubyString toS(RubyString string) {
             return string;
         }
+
+        @Specialization(guards = "isStringSubclass")
+        public Object toSOnSubclass(VirtualFrame frame, RubyString string) {
+            return ruby(frame, "''.replace(self)", "self", string);
+        }
+
+        public boolean isStringSubclass(RubyString string) {
+            return string.getLogicalClass() != getContext().getCoreLibrary().getStringClass();
+        }
+
     }
 
     @CoreMethod(names = {"to_sym", "intern"})