[Truffle] Optimized String#== for ropes with the same backing bytes b…

…ut different encodings.
jruby · Mar 24, 2016 · 07cee75 · 07cee75 · nirvdrum · Mar 24, 2016
1 parent 032ff95
commit 07cee75
Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/test/truffle/compiler/pe/core/string_pe.rb b/test/truffle/compiler/pe/core/string_pe.rb
@@ -35,3 +35,6 @@
 example "''.empty?", true
 example "'abc'.empty?", false
 example "'こにちわ'.empty?", false
+
+example "'A' == String.from_codepoint(65, Encoding::US_ASCII)", true
+example "'A' == 65.chr", true
diff --git a/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java b/truffle/src/main/java/org/jruby/truffle/core/rope/RopeTable.java
@@ -10,7 +10,7 @@
 
 package org.jruby.truffle.core.rope;
 
-import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import org.jcodings.Encoding;
 
 import java.lang.ref.WeakReference;
@@ -24,7 +24,7 @@ public class RopeTable {
     private final ReadWriteLock lock = new ReentrantReadWriteLock();
     private final WeakHashMap<Key, WeakReference<Rope>> ropesTable = new WeakHashMap<>();
 
-    @CompilerDirectives.TruffleBoundary
+    @TruffleBoundary
     public Rope getRope(byte[] bytes, Encoding encoding, CodeRange codeRange) {
         final Key key = new Key(bytes, encoding);
 

diff --git a/truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/core/rubinius/StringPrimitiveNodes.java
@@ -505,14 +505,24 @@ public StringEqualPrimitiveNode(RubyContext context, SourceSection sourceSection
 
         public abstract boolean executeStringEqual(DynamicObject string, DynamicObject other);
 
-        @Specialization(guards = "ropeEqual(string, other)")
+        @Specialization(guards = "ropeReferenceEqual(string, other)")
         public boolean stringEqualsRopeEquals(DynamicObject string, DynamicObject other) {
             return true;
         }
 
         @Specialization(guards = {
                 "isRubyString(other)",
-                "!ropeEqual(string, other)",
+                "!ropeReferenceEqual(string, other)",
+                "bytesReferenceEqual(string, other)"
+        })
+        public boolean stringEqualsBytesEquals(DynamicObject string, DynamicObject other) {
+            return true;
+        }
+
+        @Specialization(guards = {
+                "isRubyString(other)",
+                "!ropeReferenceEqual(string, other)",
+                "!bytesReferenceEqual(string, other)",
                 "!areComparable(string, other, sameEncodingProfile, firstStringEmptyProfile, secondStringEmptyProfile, firstStringCR7BitProfile, secondStringCR7BitProfile, firstStringAsciiCompatible, secondStringAsciiCompatible)"
         })
         public boolean stringEqualNotComparable(DynamicObject string, DynamicObject other,
@@ -528,7 +538,8 @@ public boolean stringEqualNotComparable(DynamicObject string, DynamicObject othe
 
         @Specialization(guards = {
                 "isRubyString(other)",
-                "!ropeEqual(string, other)",
+                "!ropeReferenceEqual(string, other)",
+                "!bytesReferenceEqual(string, other)",
                 "areComparable(string, other, sameEncodingProfile, firstStringEmptyProfile, secondStringEmptyProfile, firstStringCR7BitProfile, secondStringCR7BitProfile, firstStringAsciiCompatible, secondStringAsciiCompatible)"
         })
         public boolean equal(DynamicObject string, DynamicObject other,
@@ -599,12 +610,25 @@ protected boolean areComparable(DynamicObject first, DynamicObject second,
             return false;
         }
 
-        protected static boolean ropeEqual(DynamicObject first, DynamicObject second) {
+        protected static boolean ropeReferenceEqual(DynamicObject first, DynamicObject second) {
             assert RubyGuards.isRubyString(first);
             assert RubyGuards.isRubyString(second);
 
             return rope(first) == rope(second);
         }
+
+        protected static boolean bytesReferenceEqual(DynamicObject first, DynamicObject second) {
+            assert RubyGuards.isRubyString(first);
+            assert RubyGuards.isRubyString(second);
+
+            final Rope firstRope = rope(first);
+            final Rope secondRope = rope(second);
+
+            return firstRope.getCodeRange() == CodeRange.CR_7BIT &&
+                    secondRope.getCodeRange() == CodeRange.CR_7BIT &&
+                    firstRope.getRawBytes() != null &&
+                    firstRope.getRawBytes() == secondRope.getRawBytes();
+        }
     }
 
     @RubiniusPrimitive(name = "string_find_character")
	tagged_example "defined?(true) == 'true'", true
	tagged_example "defined?(false) == 'false'", true
	tagged_example "defined?(self) == 'self'", true
	tagged_example "defined?(14) == 'expression'", true
	tagged_example "defined?(14 + 2) == 'expression'", true