[GR-53371] Fixes for prophet

PullRequest: graalpython/3291

Author: msimacek

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/builtin/modules/PathConversionNodeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -62,6 +62,7 @@
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.PosixPath;
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltinsFactory;
 import com.oracle.graal.python.builtins.objects.PNone;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.runtime.PosixSupportLibrary.Buffer;
 import com.oracle.graal.python.runtime.PythonContext;
@@ -341,8 +342,8 @@ private String callAndExpectPath(boolean nullable, boolean allowFd, Object arg,
 
     private String callAndExpectPathEx(String script, boolean wasBufferLike) {
         PTuple o = (PTuple) evalValue(script);
-        Object arg = o.getSequenceStorage().getItemNormalized(0);
-        Object orig = o.getSequenceStorage().getItemNormalized(1);
+        Object arg = SequenceStorageNodes.GetItemScalarNode.executeUncached(o.getSequenceStorage(), 0);
+        Object orig = SequenceStorageNodes.GetItemScalarNode.executeUncached(o.getSequenceStorage(), 1);
         return callAndExpectPath(true, true, arg, orig, wasBufferLike);
     }
 

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/datatype/ListTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2024, Oracle and/or its affiliates.
  * Copyright (c) 2013, Regents of the University of California
  *
  * All rights reserved.
@@ -108,7 +108,8 @@ public void index() {
     @Test
     public void reverse() {
         String source = "llist = [1,2,3,4,5]\n" + //
-                        "print(llist.reverse())\n";
+                        "llist.reverse()\n" + //
+                        "print(llist)\n";
 
         assertPrints("[5, 4, 3, 2, 1]\n", source);
     }

graalpython/com.oracle.graal.python.test/src/tests/test_array.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -36,10 +36,11 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-import sys
 
 from array import array
 
+from tests.util import storage_to_native
+
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -102,9 +103,7 @@ def test_add_int_to_long_array():
 
 def test_array_native_storage():
     a = array('l', [1, 2, 3])
-    if sys.implementation.name == 'graalpy':
-        assert hasattr(__graalpython__, 'storage_to_native'), "Needs to be run with --python.EnableDebuggingBuiltins"
-        __graalpython__.storage_to_native(a)
+    storage_to_native(a)
     assert a[1] == 2
     a[1] = 3
     assert a == array('l', [1, 3, 3])

graalpython/com.oracle.graal.python.test/src/tests/test_bytes.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -37,8 +37,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-import unittest
 import sys
+import unittest
+
+from tests.util import storage_to_native
+
 
 def assert_raises(err, fn, *args, **kwargs):
     raised = False
@@ -107,6 +110,10 @@ def test_reverse():
     assert not b
     b.reverse()
     assert not b
+    b = bytearray(b'hello')
+    storage_to_native(b)
+    b.reverse()
+    assert b == b'olleh'
 
 
 def test_clear():

graalpython/com.oracle.graal.python.test/src/tests/test_list.py

@@ -1,11 +1,13 @@
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2024, Oracle and/or its affiliates.
 # Copyright (C) 1996-2017 Python Software Foundation
 #
 # Licensed under the PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 
-import seq_tests
 import sys
 import unittest
+
+from tests.util import storage_to_native
+
 # import pickle
 
 LONG_NUMBER = 6227020800;
@@ -840,6 +842,20 @@ def test_generalize_store(self):
         l += [0x100000000, 'a']
         self.assertEqual([1, 0x100000000, 'a'], l)
 
+    def test_reverse(self):
+        l = [1, 2, 3]
+        self.assertEqual(None, l.reverse())
+        self.assertEqual([3, 2, 1], l)
+        storage_to_native(l)
+        l.reverse()
+        self.assertEqual([1, 2, 3], l)
+        l.append(4)
+        l.reverse()
+        self.assertEqual([4, 3, 2, 1], l)
+        del l[:-1]
+        l.reverse()
+        self.assertEqual([1], l)
+
 
 if __name__ == '__main__':
     unittest.main()

graalpython/com.oracle.graal.python.test/src/tests/test_socket.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -37,10 +37,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 import socket
-import sys
 import threading
 import unittest
 
+from tests.util import storage_to_native
+
 
 def test_inet_aton():
     assert socket.inet_aton('127.255.1.2') == bytes([127, 255, 1, 2])
@@ -90,9 +91,7 @@ def server():
         buffer = memoryview(b)[1:]
         sock.recv_into(buffer, 1)
         assert b == b'12a'
-        if sys.implementation.name == 'graalpy':
-            assert hasattr(__graalpython__, 'storage_to_native'), "Needs to be run with --python.EnableDebuggingBuiltins"
-            __graalpython__.storage_to_native(b)
+        storage_to_native(b)
         # Native buffer, no internal array
         buffer = memoryview(buffer)[1:]
         sock.recv_into(buffer, 1)

graalpython/com.oracle.graal.python.test/src/tests/test_tagged_unittests.py

@@ -108,9 +108,7 @@ def test_tagged():
                 cmd.append("--inspect")
             if "-debug-java" in sys.argv:
                 cmd.append("-debug-java")
-            cmd += [RUNNER]
-            if "-vv" in sys.argv:
-                cmd += ['-v']
+            cmd += [RUNNER, '-v']
             for testpattern in working_test_group:
                 if testpattern:
                     cmd.extend(["-k", testpattern])

graalpython/com.oracle.graal.python.test/src/tests/util.py

@@ -0,0 +1,46 @@
+# Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import sys
+
+
+def storage_to_native(s):
+    if sys.implementation.name == 'graalpy':
+        assert hasattr(__graalpython__, 'storage_to_native'), "Needs to be run with --python.EnableDebuggingBuiltins"
+        __graalpython__.storage_to_native(s)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -2426,7 +2426,7 @@ static PTuple update(PTuple bases, Object[] arguments, int nargs,
                 }
                 SequenceStorage storage = newBaseTuple.getSequenceStorage();
                 for (int j = 0; j < storage.length(); j++) {
-                    newBases.add(storage.getItemNormalized(j));
+                    newBases.add(SequenceStorageNodes.GetItemScalarNode.executeUncached(storage, j));
                 }
             }
             if (newBases == null) {
@@ -2460,7 +2460,7 @@ static Object calculate(Object metatype, PTuple bases,
             int nbases = storage.length();
             Object winner = metatype;
             for (int i = 0; i < nbases; i++) {
-                Object tmp = storage.getItemNormalized(i);
+                Object tmp = SequenceStorageNodes.GetItemScalarNode.executeUncached(storage, i);
                 Object tmpType = getClass.execute(inliningTarget, tmp);
                 if (isSubType.execute(winner, tmpType)) {
                     // nothing to do
@@ -2564,7 +2564,7 @@ class InitializeBuildClass {
                             meta = PythonContext.get(update).lookupType(PythonBuiltinClassType.PythonClass);
                         } else {
                             // else get the type of the first base
-                            meta = getClass.execute(inliningTarget, bases.getSequenceStorage().getItemNormalized(0));
+                            meta = getClass.execute(inliningTarget, SequenceStorageNodes.GetItemScalarNode.executeUncached(bases.getSequenceStorage(), 0));
                         }
                         isClass = true;  // meta is really a class
                     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/CodecsModuleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -152,6 +152,7 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
+import com.oracle.graal.python.runtime.sequence.storage.ObjectSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.graal.python.util.CharsetMapping;
 import com.oracle.graal.python.util.CharsetMapping.NormalizeEncodingNameNode;
@@ -1082,7 +1083,9 @@ abstract static class ForgetCodecNode extends PythonUnaryBuiltinNode {
         @Specialization
         Object forget(VirtualFrame frame, PBytesLike encoding,
                         @Cached AsciiDecodeNode asciiDecodeNode) {
-            forget((TruffleString) ((PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE)).getSequenceStorage().getInternalArray()[0]);
+            PTuple decodeResult = (PTuple) asciiDecodeNode.execute(frame, encoding, PNone.NO_VALUE);
+            ObjectSequenceStorage resultStorage = (ObjectSequenceStorage) decodeResult.getSequenceStorage();
+            forget((TruffleString) resultStorage.getItemNormalized(0));
             return PNone.NONE;
         }