[Truffle] Completed String#force_encoding.

jruby · Mar 20, 2015 · 84562e1 · 84562e1
1 parent d390326
commit 84562e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/spec/truffle/tags/core/string/force_encoding_tags.txt b/spec/truffle/tags/core/string/force_encoding_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
@@ -1191,12 +1191,15 @@ public boolean endWith(RubyString string, RubyString b) {
     @CoreMethod(names = "force_encoding", required = 1)
     public abstract static class ForceEncodingNode extends CoreMethodNode {
 
+        @Child private ToStrNode toStrNode;
+
         public ForceEncodingNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         public ForceEncodingNode(ForceEncodingNode prev) {
             super(prev);
+            toStrNode = prev.toStrNode;
         }
 
         @TruffleBoundary
@@ -1212,6 +1215,16 @@ public RubyString forceEncoding(RubyString string, RubyEncoding encoding) {
             return string;
         }
 
+        @Specialization(guards = { "!isRubyString(arguments[1])", "!isRubyEncoding(arguments[1])" })
+        public RubyString forceEncoding(VirtualFrame frame, RubyString string, Object encoding) {
+            if (toStrNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                toStrNode = insert(ToStrNodeFactory.create(getContext(), getSourceSection(), null));
+            }
+
+            return forceEncoding(string, toStrNode.executeRubyString(frame, encoding));
+        }
+
     }
 
     @CoreMethod(names = "getbyte", required = 1)