[Truffle] Use optimized string_from_codepoint primitive for ASCII-c…

…ompatible encodings.
jruby · Apr 19, 2016 · 975f5fc · 975f5fc
1 parent 68e2305
commit 975f5fc
Showing 1 changed file with 3 additions and 1 deletion.
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
@@ -752,7 +752,9 @@ public DynamicObject stringFromCodepointSimple(long code, DynamicObject encoding
         }
 
         protected boolean isSimple(int code, DynamicObject encoding) {
-            return EncodingOperations.getEncoding(encoding) == ASCIIEncoding.INSTANCE && code >= 0x00 && code <= 0xFF;
+            final Encoding enc = EncodingOperations.getEncoding(encoding);
+
+            return (enc.isAsciiCompatible() && code >= 0x00 && code < 0x80) || (enc == ASCIIEncoding.INSTANCE && code >= 0x00 && code <= 0xFF);
         }
 
     }