Merge remote-tracking branch 'origin/otethal/truffle_string' into fa/labs-numpy-hpy-port

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "8389e99d9899cbf8f939927c130982eab7dfd24e" }
+{ "overlay": "1143cb42864b0555ad23080c5b5b2850c547bdd8" }

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_poplib.txt

@@ -44,9 +44,6 @@
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_SSLClass.test_utf8
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_SSLClass.test_utf8_raises_if_unsupported
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_apop_REDOS
-*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_apop_normal
-*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_capa
-*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_dele
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_exceptions
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_getwelcome
 *graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_list

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -25,7 +25,6 @@
  */
 package com.oracle.graal.python.builtins.objects.str;
 
-import static com.oracle.graal.python.builtins.objects.str.StringUtils.LAZY_CODEPOINT_THRESHOLD;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_ENCODE;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_ENDSWITH;
 import static com.oracle.graal.python.nodes.BuiltinNames.J_FORMAT;
@@ -151,7 +150,6 @@
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.ExecutionContext.IndirectCallContext;
 import com.oracle.graal.python.runtime.PythonContext;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.formatting.InternalFormat;
 import com.oracle.graal.python.runtime.formatting.InternalFormat.Spec;
@@ -504,7 +502,7 @@ public static AddNode create() {
         @Specialization
         TruffleString doIt(TruffleString self, TruffleString other,
                         @Shared("concat") @Cached TruffleString.ConcatNode concatNode) {
-            return concatNode.execute(self, other, TS_ENCODING, getContext().getOption(PythonOptions.LazyStrings));
+            return concatNode.execute(self, other, TS_ENCODING, false);
         }
 
         @Specialization
@@ -2508,7 +2506,7 @@ public TruffleString doString(VirtualFrame frame, Object self, Object idx,
             if (index < 0 || index >= len) {
                 throw raise(IndexError, ErrorMessages.STRING_INDEX_OUT_OF_RANGE);
             }
-            return substringNode.execute(str, index, 1, TS_ENCODING, getContext().getOption(PythonOptions.LazyStrings) && len < LAZY_CODEPOINT_THRESHOLD);
+            return substringNode.execute(str, index, 1, TS_ENCODING, false);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/lib/PyObjectStrAsObjectNode.java

@@ -58,7 +58,6 @@
 import com.oracle.graal.python.nodes.call.special.LookupSpecialMethodSlotNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -93,7 +92,7 @@ static TruffleString str(boolean object) {
     @Specialization
     TruffleString str(long object,
                     @Cached TruffleString.FromLongNode fromLongNode) {
-        return fromLongNode.execute(object, TS_ENCODING, getContext().getOption(PythonOptions.LazyStrings));
+        return fromLongNode.execute(object, TS_ENCODING, false);
     }
 
     @Specialization(guards = "!isTruffleString(obj)")

mx.graalpython/mx_graalpython.py

@@ -419,6 +419,9 @@ def update_unittest_tags(args):
         ('test_imaplib.txt', '*graalpython.lib-python.3.test.test_imaplib.NewIMAPTests.test_login_cram_md5_plain_text'),
         ('test_poplib.txt', '*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_noop'),
         ('test_poplib.txt', '*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_pass_'),
+        ('test_poplib.txt', '*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_apop_normal'),
+        ('test_poplib.txt', '*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_capa'),
+        ('test_poplib.txt', '*graalpython.lib-python.3.test.test_poplib.TestPOP3_TLSClass.test_dele'),
         ('test_weakref.txt', '*graalpython.lib-python.3.test.test_weakref.MappingTestCase.test_weak_keyed_len_cycles'),
         # Disabled since code object comparison is not stable for us
         ('test_marshal.txt', '*graalpython.lib-python.3.test.test_marshal.InstancingTestCase.testModule'),

mx.graalpython/suite.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "18c276f625350ea50c695971068f5b758756c5db",
+                "version": "1f62020c682ca5675af0a622ac70c8e1d5781224",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "18c276f625350ea50c695971068f5b758756c5db",
+                "version": "1f62020c682ca5675af0a622ac70c8e1d5781224",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "18c276f625350ea50c695971068f5b758756c5db",
+                "version": "1f62020c682ca5675af0a622ac70c8e1d5781224",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},