Merge branch 'master' into mq/GR-57401_1

Author: qunaibit

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "135a012d8317556124e728eea5f638747e21aef2" }
+{ "overlay": "a74e2e4ae250150f0f974c20c80ac212a9116ea1" }

graalpython/com.oracle.graal.python.cext/src/tupleobject.c

@@ -942,7 +942,6 @@ PyTypeObject PyTuple_Type = {
 };
 
 
-#if 0 // GraalPy change
 /* The following function breaks the notion that tuples are immutable:
    it changes the size of a tuple.  We get away with this only if there
    is only one module referencing the object.  You can also think of it
@@ -960,7 +959,8 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
 
     v = (PyTupleObject *) *pv;
     if (v == NULL || !Py_IS_TYPE(v, &PyTuple_Type) ||
-        (Py_SIZE(v) != 0 && Py_REFCNT(v) != 1)) {
+        // GraalPy change: ignore refcnt
+        /* (Py_SIZE(v) != 0 && Py_REFCNT(v) != 1) */ 0) {
         *pv = 0;
         Py_XDECREF(v);
         PyErr_BadInternalCall();
@@ -973,7 +973,9 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
     }
     if (newsize == 0) {
         Py_DECREF(v);
-        *pv = tuple_get_empty();
+        // GraalPy change: no empty tuple singleton
+        // *pv = tuple_get_empty();
+        *pv = PyTuple_New(0);
         return 0;
     }
     if (oldsize == 0) {
@@ -987,6 +989,19 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
         return *pv == NULL ? -1 : 0;
     }
 
+    // Begin GraalPy change
+    if (points_to_py_handle_space(v)) {
+        GraalPyVarObject *o = (GraalPyVarObject *)pointer_to_stub(v);
+        PyObject** new_items = GraalPyTruffleTuple_Resize((PyObject *)v, newsize, o->ob_item);
+        if (new_items == NULL && o->ob_item != NULL) {
+            *pv = NULL;
+            return -1;
+        }
+        o->ob_size = newsize;
+        o->ob_item = new_items;
+        return 0;
+    }
+    // End GraalPy change
     if (_PyObject_GC_IS_TRACKED(v)) {
         _PyObject_GC_UNTRACK(v);
     }
@@ -1016,6 +1031,7 @@ _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
     return 0;
 }
 
+#if 0 // GraalPy change
 
 static void maybe_freelist_clear(PyInterpreterState *, int);
 

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_ctypes.py

@@ -39,6 +39,7 @@
 import ctypes
 import os.path
 import struct
+import sys
 
 from tests.cpyext import CPyExtTestCase, CPyExtType
 
@@ -225,3 +226,27 @@ class MyLargeStruct(ctypes.Structure):
             assert result.num7 == 42
         finally:
             os.chdir(original_cwd)
+
+
+def test_void_p():
+    assert ctypes.c_void_p(True).value == ctypes.c_void_p(1).value
+    assert ctypes.c_void_p(False).value == ctypes.c_void_p(0).value
+    assert ctypes.c_void_p(2**128 - 1).value == ctypes.c_void_p(2**64 - 1).value
+    try:
+        ctypes.c_void_p(2**128 - 1)
+    except TypeError as e:
+        assert "cannot be converted to pointer" in str(e)
+
+
+def test_meson_windows_detect_native_arch() -> str:
+    if sys.platform != 'win32':
+        return
+    process_arch = ctypes.c_ushort()
+    native_arch = ctypes.c_ushort()
+    kernel32 = ctypes.windll.kernel32
+    process = ctypes.c_void_p(kernel32.GetCurrentProcess())
+    try:
+        if kernel32.IsWow64Process2(process, ctypes.byref(process_arch), ctypes.byref(native_arch)):
+            assert native_arch.value == 0x8664, "only amd64 supported by GraalPy on Windows"
+    except AttributeError as e:
+        assert "Unknown identifier: IsWow64Process2" in str(e)

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_tuple.py

@@ -67,6 +67,13 @@ def _reference_setitem(args):
     return tuple(t)
 
 
+def _reference_resize(args):
+    original = args[0]
+    newsize = args[1]
+    return original[:newsize] + (None,) * (newsize - len(original))
+    return tuple(result)
+
+
 class MyStr(str):
 
     def __init__(self, s):
@@ -259,6 +266,35 @@ class TestPyTuple(CPyExtTestCase):
         cmpfunc=unhandled_error_compare
     )
 
+    # _PyTuple_Resize
+    test_PyTuple_Resize = CPyExtFunction(
+        _reference_resize,
+        lambda: (
+            ((1, 2, 3), 1),
+            ((), 1),
+            ((1, 2, 3), 5),
+        ),
+        code="""
+        PyObject* wrap_PyTuple_Resize(PyObject* original, int newsize) {
+            int size = PyTuple_Size(original);
+            PyObject *freshTuple = PyTuple_New(size);
+            for (int i = 0; i < size; ++i) {
+                PyTuple_SET_ITEM(freshTuple, i, Py_NewRef(PyTuple_GetItem(original, i)));
+            }
+            _PyTuple_Resize(&freshTuple, newsize);
+            for (int i = size; i < newsize; i++) {
+                PyTuple_SET_ITEM(freshTuple, i, Py_NewRef(Py_None));
+            }
+            return freshTuple;
+        }
+        """,
+        resultspec="O",
+        argspec='Oi',
+        arguments=["PyObject* original", "Py_ssize_t newsize"],
+        callfunction="wrap_PyTuple_Resize",
+        cmpfunc=unhandled_error_compare,
+    )
+
 
 class TestNativeSubclass(unittest.TestCase):
     def _verify(self, t):

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_weakref.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, 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,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+import gc
+import time
 import unittest
 import weakref
 
-from . import CPyExtType, assert_raises
+from . import CPyExtFunction, CPyExtType, assert_raises
 
 TestWeakRefHelper = CPyExtType(
     'TestWeakRefHelper',
@@ -95,3 +97,47 @@ class Bar(clazz):
         x = Bar()
         y = weakref.ref(x)
         assert type(y) == weakref.ReferenceType
+
+    def clear_ref_arguments():
+        class Foo():
+            pass
+        f = Foo()
+        log = []
+        wr = weakref.ref(f, lambda wr: log.append("cb called"))
+        return ((f, wr, log),)
+
+    def clear_ref_equivalent(args):
+        # Ignore args. There is no clearref in python, so
+        # the equivalent is a weakref that never had a callback
+        # in the first place
+        class Foo():
+            pass
+        f = Foo()
+        return weakref.ref(f), []
+
+    def compare_cleared_weakref(cresult, presult):
+        cwr, clog = cresult
+        pwr, plog = presult
+        for i in range(3):
+            gc.collect()
+            time.sleep(1)
+        assert cwr() is None
+        assert pwr() is None
+        assert not clog
+        assert not plog
+        return True
+
+    test_PyWeakref_ClearRef = CPyExtFunction(
+        clear_ref_equivalent,
+        clear_ref_arguments,
+        code="""
+        PyObject* wrap_PyWeakref_ClearRef(PyObject *o, PyObject* weakref, PyObject* log) {
+            _PyWeakref_ClearRef((PyWeakReference *)weakref);
+            return Py_BuildValue("OO", weakref, log);
+        }
+        """,
+        argspec='OOO',
+        arguments=["PyObject* o", "PyObject* weakref", "PyObject* log"],
+        callfunction="wrap_PyWeakref_ClearRef",
+        cmpfunc=compare_cleared_weakref,
+    )

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

@@ -258,7 +258,8 @@ def print_missing_graalpy_msg(graalpy_home=None):
             sep="\n")
 
 def get_graalvm_version():
-    graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], os.environ.copy())
+    if not (graalvmVersion := os.environ.get("GRAAL_VERSION")):
+        graalvmVersion, _ = run_cmd([get_gp(), "-c", "print(__graalpython__.get_graalvm_version(), end='')"], os.environ.copy())
     # when JLine is cannot detect a terminal, it prints logging info
     graalvmVersion = graalvmVersion.split("\n")[-1]
     # we never test -dev versions here, we always pretend to use release versions

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

@@ -172,6 +172,11 @@ def foo(**kwargs):
 
     assert foo(a=5, b=6) == {'a': 1, 'b': 1}
 
+    d = dict.fromkeys({'a': 1, 'b': 2, 'c': 3})
+    assert len(d) == 3
+    assert set(d.keys()) == {'a', 'b', 'c'}
+    assert set(d.values()) == {None}
+
 
 def test_init():
     d = dict(a=1, b=2, c=3)

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2025, 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
@@ -876,7 +876,6 @@ def test_sysconf_names(self):
         self.assertIn('SC_CLK_TCK', os.sysconf_names)
 
     def test_sysconf(self):
-        self.assertGreaterEqual(os.sysconf('SC_CLK_TCK'), 0)
         with self.assertRaisesRegex(TypeError, 'strings or integers'):
             os.sysconf(object())
         with self.assertRaisesRegex(ValueError, 'unrecognized'):
@@ -889,6 +888,17 @@ def test_sysconf(self):
         else:
             assert False
 
+        # constants taken from POSIX where defined
+        self.assertGreaterEqual(os.sysconf('SC_ARG_MAX'), 4096)
+        self.assertGreaterEqual(os.sysconf('SC_CHILD_MAX'), 25)
+        self.assertGreaterEqual(os.sysconf('SC_LOGIN_NAME_MAX'), 9)
+        self.assertGreaterEqual(os.sysconf('SC_CLK_TCK'), 0)
+        self.assertGreaterEqual(os.sysconf('SC_OPEN_MAX'), 20)
+        self.assertGreaterEqual(os.sysconf('SC_PAGESIZE'), 1)
+        os.sysconf('SC_SEM_NSEMS_MAX') # returns -1 on my linux box, just check it's there
+        self.assertGreaterEqual(os.sysconf('SC_PHYS_PAGES'), 1)
+        self.assertGreaterEqual(os.sysconf('SC_NPROCESSORS_CONF'), 1)
+
 
 if __name__ == '__main__':
     unittest.main()

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

@@ -50,7 +50,23 @@
     import termios
     from textwrap import dedent
 
+    # The terminal tests can be flaky
+    def autoretry(fn):
+        def decorated(*args, **kwargs):
+            retries = 3
+            while retries:
+                try:
+                    fn(*args, **kwargs)
+                    return
+                except Exception:
+                    retries -= 1
+                    print("Retrying test")
+                    continue
+            fn(*args, **kwargs)
+        return decorated
 
+
+    @autoretry
     def validate_repl(stdin, python_args=(), ignore_preamble=True):
         env = os.environ.copy()
         env['TERM'] = 'ansi'

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

@@ -21,5 +21,5 @@ test.test_cmd_line.CmdLineTest.test_unbuffered_input @ darwin-arm64,darwin-x86_6
 test.test_cmd_line.CmdLineTest.test_unbuffered_output @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cmd_line.CmdLineTest.test_unmached_quote @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cmd_line.CmdLineTest.test_verbose @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
-test.test_cmd_line.CmdLineTest.test_version @ linux-x86_64
+test.test_cmd_line.CmdLineTest.test_version @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_cmd_line.IgnoreEnvironmentTest.test_ignore_PYTHONPATH @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64