Fixes #3046. Shellescaped utf-8 string misbehaving in backticks

jruby · Jul 1, 2015 · c9c2390 · c9c2390
1 parent c61f2bb
commit c9c2390
Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/org/jruby/ast/DXStrNode.java b/core/src/main/java/org/jruby/ast/DXStrNode.java
@@ -42,7 +42,7 @@
  */
 public class DXStrNode extends DNode implements ILiteralNode {
     public DXStrNode(ISourcePosition position, DStrNode node) {
-        super(position);
+        super(position, node.getEncoding());
         addAll(node);
     }
 

diff --git a/core/src/main/java/org/jruby/ir/instructions/BacktickInstr.java b/core/src/main/java/org/jruby/ir/instructions/BacktickInstr.java
@@ -49,7 +49,7 @@ public Object interpret(ThreadContext context, StaticScope currScope, DynamicSco
 
         for (Operand p: operands) {
             RubyBasicObject piece = (RubyBasicObject) p.retrieve(context, self, currScope, currDynScope, temp);
-            newString.append((piece instanceof RubyString) ? (RubyString) piece : piece.to_s());
+            newString.append19((piece instanceof RubyString) ? (RubyString) piece : piece.to_s());
         }
 
         newString.setFrozen(true);

diff --git a/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java b/core/src/main/java/org/jruby/ir/targets/JVMVisitor.java
@@ -643,7 +643,7 @@ public void BacktickInstr(BacktickInstr instr) {
             jvmAdapter().invokevirtual(p(IRubyObject.class), "anyToString", sig(IRubyObject.class));
 
             jvmAdapter().label(after);
-            jvmAdapter().invokevirtual(p(RubyString.class), "append", sig(RubyString.class, IRubyObject.class));
+            jvmAdapter().invokevirtual(p(RubyString.class), "append19", sig(RubyString.class, IRubyObject.class));
         }
 
         // freeze the string