[Truffle] Ensure we don't incorrectly mark a String as being 7-bit wh…

…en it isn't in Array#pack.
jruby · Feb 2, 2016 · d07dad9 · d07dad9
1 parent 4211ade
commit d07dad9
Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackNode.java
@@ -21,6 +21,7 @@
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.core.array.ArrayUtils;
 import org.jruby.util.ByteList;
+import org.jruby.util.StringSupport;
 
 import java.util.Arrays;
 
@@ -197,6 +198,7 @@ protected void writeByte(VirtualFrame frame, byte value) {
         final int outputPosition = getOutputPosition(frame);
         output[outputPosition] = value;
         setOutputPosition(frame, outputPosition + 1);
+        setStringCodeRange(frame, value >= 0 ? StringSupport.CR_7BIT : StringSupport.CR_VALID);
         increaseStringLength(frame, 1);
     }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackRootNode.java b/truffle/src/main/java/org/jruby/truffle/core/format/nodes/PackRootNode.java
@@ -48,7 +48,7 @@ public Object execute(VirtualFrame frame) {
         frame.setObject(PackFrameDescriptor.OUTPUT_SLOT, new byte[expectedLength]);
         frame.setInt(PackFrameDescriptor.OUTPUT_POSITION_SLOT, 0);
         frame.setInt(PackFrameDescriptor.STRING_LENGTH_SLOT, 0);
-        frame.setInt(PackFrameDescriptor.STRING_CODE_RANGE_SLOT, StringSupport.CR_7BIT);
+        frame.setInt(PackFrameDescriptor.STRING_CODE_RANGE_SLOT, StringSupport.CR_UNKNOWN);
         frame.setBoolean(PackFrameDescriptor.TAINT_SLOT, false);
 
         child.execute(frame);