[Truffle] Re-added the boundary to RopeOperations.create and made the…

… String PE tests work with the boundary in place.
jruby · Nov 17, 2016 · 7142171 · 7142171
1 parent 51fd3a3
commit 7142171
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeOperations.java
@@ -56,6 +56,7 @@ public class RopeOperations {
 
     private static final ConcurrentHashMap<Encoding, Charset> encodingToCharsetMap = new ConcurrentHashMap<>();
 
+    @TruffleBoundary
     public static LeafRope create(byte[] bytes, Encoding encoding, CodeRange codeRange) {
         if (bytes.length == 1) {
             final int index = bytes[0] & 0xff;
@@ -89,7 +90,6 @@ public static LeafRope create(byte[] bytes, Encoding encoding, CodeRange codeRan
             case CR_VALID: return new ValidLeafRope(bytes, encoding, characterLength);
             case CR_BROKEN: return new InvalidLeafRope(bytes, encoding);
             default: {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
                 throw new RuntimeException(StringUtils.format("Unknown code range type: %d", codeRange));
             }
         }

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/TruffleRopesNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rope/TruffleRopesNodes.java
@@ -128,7 +128,7 @@ public abstract static class CreateSimpleStringNode extends CoreMethodArrayArgum
 
         @Specialization
         public DynamicObject createSimpleString() {
-            return createString(RopeOperations.create(new byte[]{'t', 'e', 's', 't'}, UTF8Encoding.INSTANCE, CodeRange.CR_7BIT));
+            return createString(new AsciiOnlyLeafRope(new byte[]{'t', 'e', 's', 't'}, UTF8Encoding.INSTANCE));
         }
     }