jruby · Jun 8, 2016 · Jun 8, 2016
Showing with 0 additions and 28 deletions.

+0 −11 truffle/src/main/java/org/jruby/truffle/core/string/StringNodes.java

+0 −16 truffle/src/main/java/org/jruby/truffle/core/string/StringOperations.java

+0 −1 truffle/src/main/ruby/core/string.rb
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
@@ -1484,17 +1484,6 @@ public Object lstripBang(DynamicObject string) {
         }
     }
 
-    @NonStandard
-    @CoreMethod(names = "modify!", raiseIfFrozenSelf = true)
-    public abstract static class ModifyBangNode extends CoreMethodArrayArgumentsNode {
-
-        @Specialization
-        public DynamicObject modifyBang(DynamicObject string) {
-            StringOperations.modify(string);
-            return string;
-        }
-    }
-
     @NonStandard
     @CoreMethod(names = "num_bytes=", lowerFixnumParameters = 0, required = 1)
     public abstract static class SetNumBytesNode extends CoreMethodArrayArgumentsNode {

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
@@ -134,18 +134,7 @@ public static void keepCodeRange(DynamicObject string) {
         }
     }
 
-    public static void modify(DynamicObject string) {
-        // No-op. Ropes are immutable so any modifications must've been handled elsewhere.
-        // TODO (nirvdrum 07-Jan-16) Remove this method once we've inspected each caller for correctness.
-    }
-
-    public static void modify(DynamicObject string, int length) {
-        // No-op. Ropes are immutable so any modifications must've been handled elsewhere.
-        // TODO (nirvdrum 07-Jan-16) Remove this method once we've inspected each caller for correctness.
-    }
-
     public static void modifyAndKeepCodeRange(DynamicObject string) {
-        modify(string);
         keepCodeRange(string);
     }
 
@@ -165,11 +154,6 @@ public static Encoding checkEncoding(DynamicObject string, CodeRangeable other)
         return encoding;
     }
 
-    public static void forceEncodingVerySlow(DynamicObject string, Encoding encoding) {
-        final Rope oldRope = Layouts.STRING.getRope(string);
-        StringOperations.setRope(string, RopeOperations.withEncodingVerySlow(oldRope, encoding, CodeRange.CR_UNKNOWN));
-    }
-
     public static int normalizeIndex(int length, int index) {
         return ArrayOperations.normalizeIndex(length, index);
     }

diff --git a/truffle/src/main/ruby/core/string.rb b/truffle/src/main/ruby/core/string.rb
@@ -435,7 +435,6 @@ def suffix?(other)
   end
 
   def shorten!(size)
-    self.modify!
     return if bytesize == 0
     self.num_bytes -= size
   end