[Truffle] Replace most calls to createRope by encodeRope.

jruby · Nov 8, 2016 · b11a300 · b11a300
1 parent fd5b2f1
commit b11a300
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java b/truffle/src/main/java/org/jruby/truffle/core/regexp/RegexpNodes.java
@@ -244,7 +244,7 @@ public static Rope shimModifiers(Rope bytes) {
                     throw new UnsupportedOperationException();
             }
 
-            bytes = StringOperations.createRope(bytesString, ASCIIEncoding.INSTANCE);
+            bytes = StringOperations.encodeRope(bytesString, ASCIIEncoding.INSTANCE);
         }
 
         return bytes;

diff --git a/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java
@@ -1295,7 +1295,7 @@ public DynamicObject initialize(DynamicObject self, NotProvided from) {
         @Specialization
         public DynamicObject initializeJavaString(DynamicObject self, String from) {
             raiseIfFrozen(self);
-            StringOperations.setRope(self, StringOperations.createRope(from, ASCIIEncoding.INSTANCE));
+            StringOperations.setRope(self, StringOperations.encodeRope(from, ASCIIEncoding.INSTANCE));
             return self;
         }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java b/truffle/src/main/java/org/jruby/truffle/debug/TruffleDebugNodes.java
@@ -146,7 +146,7 @@ public abstract static class ArrayStorageNode extends CoreMethodArrayArgumentsNo
         @Specialization(guards = "isRubyArray(array)")
         public DynamicObject arrayStorage(DynamicObject array) {
             String storage = ArrayStrategy.of(array).toString();
-            return StringOperations.createString(getContext(), StringOperations.createRope(storage, USASCIIEncoding.INSTANCE));
+            return StringOperations.createString(getContext(), StringOperations.encodeRope(storage, USASCIIEncoding.INSTANCE));
         }
 
     }

diff --git a/truffle/src/main/java/org/jruby/truffle/gem/bcrypt/BCryptNodes.java b/truffle/src/main/java/org/jruby/truffle/gem/bcrypt/BCryptNodes.java
@@ -16,6 +16,7 @@
 import org.jruby.truffle.builtins.CoreClass;
 import org.jruby.truffle.builtins.CoreMethod;
 import org.jruby.truffle.builtins.CoreMethodArrayArgumentsNode;
+import org.jruby.truffle.core.rope.CodeRange;
 import org.jruby.truffle.core.string.StringOperations;
 
 @CoreClass("Truffle::Gem::BCrypt")
@@ -30,9 +31,8 @@ public Object hashpw(DynamicObject secret, DynamicObject salt) {
             final String result = BCrypt.hashpw(
                     StringOperations.getString(secret),
                     StringOperations.getString(salt));
-            return StringOperations.createString(
-                    getContext(),
-                    StringOperations.createRope(result, USASCIIEncoding.INSTANCE));
+            return StringOperations.createString(getContext(),
+                            StringOperations.encodeRope(result, USASCIIEncoding.INSTANCE, CodeRange.CR_7BIT));
         }
     }
 
@@ -42,9 +42,8 @@ public abstract static class GenerateSalt extends CoreMethodArrayArgumentsNode {
         @TruffleBoundary
         @Specialization
         public Object gensalt(int cost) {
-            return StringOperations.createString(
-                    getContext(),
-                    StringOperations.createRope(BCrypt.gensalt(cost), USASCIIEncoding.INSTANCE));
+            return StringOperations.createString(getContext(),
+                            StringOperations.encodeRope(BCrypt.gensalt(cost), USASCIIEncoding.INSTANCE, CodeRange.CR_7BIT));
         }
     }
 }