[Truffle] More String-related boundary fixes.

jruby · Nov 15, 2016 · ce03fa4 · ce03fa4
1 parent 7cd8a55
commit ce03fa4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 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
@@ -120,7 +120,6 @@ public static String decodeUTF8(Rope rope) {
         return decode(UTF8, rope.getBytes(), 0, rope.byteLength());
     }
 
-    @TruffleBoundary
     public static String decodeUTF8(byte[] bytes, int offset, int byteLength) {
         return decode(UTF8, bytes, offset, byteLength);
     }
@@ -600,7 +599,7 @@ private static CodeRange commonCodeRange(CodeRange first, CodeRange second) {
         return CR_VALID;
     }
 
-    @TruffleBoundary
+    @TruffleBoundary(throwsControlFlowException = true)
     public static int codePoint(RubyContext context, Rope rope, int start) {
         byte[] bytes = rope.getBytes();
         int p = start;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java
@@ -69,8 +69,6 @@ public static DynamicObject createString(RubyContext context, Rope rope) {
         return Layouts.STRING.createString(context.getCoreLibrary().getStringFactory(), rope);
     }
 
-    // Since ByteList.toString does not decode properly
-    @TruffleBoundary
     public static String getString(DynamicObject string) {
         return RopeOperations.decodeRope(StringOperations.rope(string));
     }