Update to hpy 79571e2c558318f10be6f04040e6781ebbadb86f

timfel · timfel · commit 56103bff65ac · 2025-04-10T13:41:37.000+02:00
diff --git a/graalpython/hpy/.github/workflows/valgrind-tests.yml b/graalpython/hpy/.github/workflows/valgrind-tests.yml
@@ -23,7 +23,7 @@ jobs:
           python-version: 3.9
 
       - name: Install / Upgrade Python dependencies
-        run: python -m pip install --upgrade pip wheel
+        run: python -m pip install --upgrade pip wheel setuptools
 
       - name: Build
         run: |
diff --git a/graalpython/hpy/hpy/universal/src/hpymodule.c b/graalpython/hpy/hpy/universal/src/hpymodule.c
@@ -22,9 +22,6 @@
 #ifdef PYPY_VERSION
 #  error "Cannot build hpy.universal on top of PyPy. PyPy comes with its own version of it"
 #endif
-#ifdef GRAALVM_PYTHON
-#  error "Cannot build hpy.universal on top of GraalPy. GraalPy comes with its own version of it"
-#endif
 
 static const char *hpy_mode_names[] = {
         "MODE_UNIVERSAL",
diff --git a/graalpython/hpy/setup.py b/graalpython/hpy/setup.py
@@ -4,9 +4,9 @@
 from setuptools.command.build_clib import build_clib
 import platform
 
-# this package is supposed to be installed ONLY on CPython. Try to bail out
-# with a meaningful error message in other cases.
-if sys.implementation.name != 'cpython':
+# this package is supposed to be installed ONLY on CPython and GraalPy. Try to
+# bail out with a meaningful error message in other cases.
+if sys.implementation.name not in ('cpython', 'graalpy'):
     msg = 'ERROR: Cannot install and/or update hpy on this python implementation:\n'
     msg += f'    sys.implementation.name == {sys.implementation.name!r}\n\n'
     if '_hpy_universal' in sys.builtin_module_names:
diff --git a/graalpython/hpy/test/conftest.py b/graalpython/hpy/test/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+import sys
 from .support import ExtensionCompiler, DefaultExtensionTemplate,\
     PythonSubprocessRunner, HPyDebugCapture, make_hpy_abi_fixture
 from pathlib import Path
@@ -32,6 +33,13 @@ def pytest_configure(config):
         "markers", "syncgc: Mark tests that rely on a synchronous GC."
     )
 
+
+def pytest_runtest_setup(item):
+    if any(item.iter_markers(name="syncgc")):
+        if sys.implementation.name in ("pypy", "graalpy"):
+            pytest.skip("requires synchronous garbage collector")
+
+
 # this is the default set of hpy_abi for all the tests. Individual files and
 # classes can override it.
 hpy_abi = make_hpy_abi_fixture('default')
diff --git a/graalpython/hpy/test/debug/test_charptr.py b/graalpython/hpy/test/debug/test_charptr.py
@@ -1,6 +1,7 @@
 import os
 import pytest
-from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
+import sys
+from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION, IS_GRAALPY
 
 # Tests detection of usage of char pointers associated with invalid already
 # closed handles. For now, the debug mode does not provide any hook for this
@@ -13,6 +14,7 @@ def hpy_abi():
         yield "debug"
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="fails on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_charptr_use_after_implicit_arg_handle_close(compiler, python_subprocess):
     mod = compiler.compile_module("""
@@ -70,6 +72,7 @@ def test_charptr_use_after_implicit_arg_handle_close(compiler, python_subprocess
             assert b"UnicodeDecodeError" in result.stderr
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="fails on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_charptr_use_after_handle_close(compiler, python_subprocess):
     mod = compiler.compile_module("""
@@ -121,6 +124,7 @@ def test_charptr_use_after_handle_close(compiler, python_subprocess):
             assert b"UnicodeDecodeError" in result.stderr
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="transiently fails on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_MEM_PROTECTION, reason=
                     "Could be implemented by checking the contents on close.")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
diff --git a/graalpython/hpy/test/debug/test_context_reuse.py b/graalpython/hpy/test/debug/test_context_reuse.py
@@ -1,10 +1,15 @@
 import pytest
+import sys
+
+from ..support import IS_GRAALPY
+
 
 @pytest.fixture
 def hpy_abi():
     return "debug"
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="Hangs on GraalPy")
 def test_reuse_context_from_global_variable(compiler, python_subprocess):
     mod = compiler.compile_module("""
         #include <stdio.h>
diff --git a/graalpython/hpy/test/debug/test_handles_invalid.py b/graalpython/hpy/test/debug/test_handles_invalid.py
@@ -1,7 +1,7 @@
 import pytest
 import sys
 from hpy.debug.leakdetector import LeakDetector
-from ..support import SUPPORTS_SYS_EXECUTABLE, IS_PYTHON_DEBUG_BUILD
+from ..support import SUPPORTS_SYS_EXECUTABLE, IS_PYTHON_DEBUG_BUILD, IS_GRAALPY
 from ..conftest import IS_VALGRIND_RUN
 
 @pytest.fixture
@@ -12,6 +12,8 @@ def hpy_abi():
 
 @pytest.mark.skipif(sys.implementation.name == 'pypy',
     reason="Cannot recover from use-after-close on pypy")
+@pytest.mark.skipif(IS_GRAALPY,
+    reason="This corrupts process memory on GraalPy and crashes later")
 def test_no_invalid_handle(compiler, hpy_debug_capture):
     # Basic sanity check that valid code does not trigger any error reports
     mod = compiler.make_module("""
@@ -38,6 +40,8 @@ def test_no_invalid_handle(compiler, hpy_debug_capture):
 
 @pytest.mark.skipif(sys.implementation.name == 'pypy',
     reason="Cannot recover from use-after-close on pypy")
+@pytest.mark.skipif(IS_GRAALPY,
+    reason="This corrupts process memory on GraalPy and crashes later")
 def test_cant_use_closed_handle(compiler, hpy_debug_capture):
     mod = compiler.make_module("""
         HPyDef_METH(f, "f", HPyFunc_O, .doc="double close")
@@ -113,6 +117,8 @@ def test_cant_use_closed_handle(compiler, hpy_debug_capture):
 
 @pytest.mark.skipif(sys.implementation.name == 'pypy',
     reason="Cannot recover from use-after-close on pypy")
+@pytest.mark.skipif(IS_GRAALPY,
+    reason="This corrupts process memory on GraalPy and crashes later")
 def test_keeping_and_reusing_argument_handle(compiler, hpy_debug_capture):
     mod = compiler.make_module("""
         HPy keep;
@@ -142,6 +148,7 @@ def test_keeping_and_reusing_argument_handle(compiler, hpy_debug_capture):
     assert hpy_debug_capture.invalid_handles_count == 1
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
 def test_return_ctx_constant_without_dup(compiler, python_subprocess, fatal_exit_code):
     # Since this puts the context->h_None into an inconsistent state, we run
     # this test in a subprocess and check fatal error instead
@@ -163,6 +170,7 @@ def test_return_ctx_constant_without_dup(compiler, python_subprocess, fatal_exit
     assert b"Invalid usage of already closed handle" in result.stderr
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
 def test_close_ctx_constant(compiler, python_subprocess, fatal_exit_code):
     # Since this puts the context->h_True into an inconsistent state, we run
     # this test in a subprocess and check fatal error instead
@@ -185,6 +193,7 @@ def test_close_ctx_constant(compiler, python_subprocess, fatal_exit_code):
     assert b"Invalid usage of already closed handle" in result.stderr
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
 def test_invalid_handle_crashes_python_if_no_hook(compiler, python_subprocess, fatal_exit_code):
     if not SUPPORTS_SYS_EXECUTABLE:
         pytest.skip("no sys.executable")
diff --git a/graalpython/hpy/test/debug/test_misc.py b/graalpython/hpy/test/debug/test_misc.py
@@ -1,11 +1,13 @@
 import pytest
-from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
+import sys
+from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION, IS_GRAALPY
 
 @pytest.fixture
 def hpy_abi():
     return "debug"
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="hangs on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_use_invalid_as_struct(compiler, python_subprocess):
     mod = compiler.compile_module("""
@@ -38,6 +40,7 @@ def test_use_invalid_as_struct(compiler, python_subprocess):
     assert "Invalid usage of _HPy_AsStruct_Object" in result.stderr.decode("utf-8")
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="hangs on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_typecheck(compiler, python_subprocess):
     mod = compiler.compile_module("""
@@ -60,6 +63,7 @@ def test_typecheck(compiler, python_subprocess):
     assert "HPy_TypeCheck arg 2 must be a type" in result.stderr.decode("utf-8")
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="hangs on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_MEM_PROTECTION, reason=
                     "Could be implemented by checking the contents on close.")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
@@ -119,6 +123,7 @@ def test_type_getname(compiler, python_subprocess):
     assert result.returncode != 0
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="hangs on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_type_issubtype(compiler, python_subprocess):
     mod = compiler.compile_module("""
@@ -143,6 +148,7 @@ def test_type_issubtype(compiler, python_subprocess):
     assert "HPyType_IsSubtype arg 1 must be a type" in result.stderr.decode("utf-8")
 
 
+@pytest.mark.skipif(IS_GRAALPY, reason="transiently fails on GraalPy")
 @pytest.mark.skipif(not SUPPORTS_SYS_EXECUTABLE, reason="needs subprocess")
 def test_unicode_substring(compiler, python_subprocess):
     mod = compiler.compile_module("""
diff --git a/graalpython/hpy/test/hpy_devel/test_distutils.py b/graalpython/hpy/test/hpy_devel/test_distutils.py
@@ -16,7 +16,7 @@
 import py
 import pytest
 
-from ..support import atomic_run, HPY_ROOT
+from ..support import atomic_run, HPY_ROOT, IS_GRAALPY
 
 # ====== IMPORTANT DEVELOPMENT TIP =====
 # You can use py.test --reuse-venv to speed up local testing.
@@ -43,7 +43,7 @@ def print_CalledProcessError(p):
 
 @pytest.fixture(scope='session')
 def venv_template(request, tmpdir_factory):
-    if request.config.option.reuse_venv:
+    if getattr(request.config.option, "reuse_venv", False):
         d = py.path.local('/tmp/venv-for-hpytest')
         if d.check(dir=True):
             # if it exists, we assume it's correct. If you want to recreate,
@@ -59,7 +59,7 @@ def venv_template(request, tmpdir_factory):
     # it's just easier to use e.g. python -m pip
     attach_python_to_venv(d)
     for script in d.bin.listdir():
-        if script.basename.startswith('python'):
+        if script.basename.startswith(('python', 'graalpy')):
             continue
         script.remove()
     #
@@ -95,7 +95,7 @@ def initargs(self, pytestconfig, tmpdir, venv_template):
         self.tmpdir = tmpdir
         # create a fresh venv by copying the template
         self.venv = tmpdir.join('venv')
-        shutil.copytree(venv_template, self.venv)
+        shutil.copytree(venv_template, self.venv, symlinks=True)
         attach_python_to_venv(self.venv)
         # create the files for our test project
         self.hpy_test_project = tmpdir.join('hpy_test_project').ensure(dir=True)
@@ -290,6 +290,7 @@ def test_hpymod_wheel(self, hpy_abi):
         doc = self.get_docstring('hpymod')
         assert doc == f'hpymod with HPy ABI: {hpy_abi}'
 
+    @pytest.mark.skipif(IS_GRAALPY, reason='not supported on GraalPy')
     def test_dont_mix_cpython_and_universal_abis(self):
         """
         See issue #322
@@ -328,6 +329,8 @@ def test_dont_mix_cpython_and_universal_abis(self):
     def test_hpymod_legacy(self, hpy_abi):
         if hpy_abi == 'universal':
             pytest.skip('only for cpython and hybrid ABIs')
+        if IS_GRAALPY:
+            pytest.skip('not supported on GraalPy')
         self.gen_setup_py("""
             setup(name = "hpy_test_project",
                   hpy_ext_modules = [hpymod_legacy],
diff --git a/graalpython/hpy/test/support.py b/graalpython/hpy/test/support.py
@@ -19,6 +19,8 @@
 # True if we are running on the CPython debug build
 IS_PYTHON_DEBUG_BUILD = hasattr(sys, 'gettotalrefcount')
 
+IS_GRAALPY = getattr(getattr(sys, "implementation", None), "name", None) == 'graalpy'
+
 # pytest marker to run tests only on linux
 ONLY_LINUX = pytest.mark.skipif(sys.platform!='linux', reason='linux only')
 
@@ -441,6 +443,7 @@ def run(self, mod, code):
 
 @pytest.mark.usefixtures('initargs')
 class HPyTest:
+    is_graalpy = IS_GRAALPY  # Exposed here for tests running as PyPy apptests
     ExtensionTemplate = DefaultExtensionTemplate
 
     @pytest.fixture()
diff --git a/graalpython/hpy/test/test_cpy_compat.py b/graalpython/hpy/test/test_cpy_compat.py
@@ -1,4 +1,5 @@
-from .support import HPyTest, make_hpy_abi_fixture
+import pytest
+from .support import HPyTest, make_hpy_abi_fixture, IS_GRAALPY
 
 class TestCPythonCompatibility(HPyTest):
 
@@ -30,6 +31,7 @@ def test_abi(self):
             expected = 'hybrid'
         assert hpy_abi == expected
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
     def test_frompyobject(self):
         mod = self.make_module("""
             #include <Python.h>
@@ -132,6 +134,7 @@ def foo(self):
         obj = MyClass()
         assert mod.f(obj) == 1234
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
     def test_hpy_close(self):
         mod = self.make_module("""
             #include <Python.h>
@@ -156,6 +159,7 @@ def test_hpy_close(self):
         if self.supports_refcounts():
             assert x == -1
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
     def test_hpy_dup(self):
         mod = self.make_module("""
             #include <Python.h>
@@ -182,6 +186,7 @@ def test_hpy_dup(self):
         if self.supports_refcounts():
             assert x == +1
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Crashes on GraalPy")
     def test_many_handles(self):
         mod = self.make_module("""
             #include <Python.h>
diff --git a/graalpython/hpy/test/test_hpyerr.py b/graalpython/hpy/test/test_hpyerr.py
@@ -1,4 +1,5 @@
-from .support import HPyTest, SUPPORTS_SYS_EXECUTABLE, trampoline
+import pytest
+from .support import HPyTest, SUPPORTS_SYS_EXECUTABLE, trampoline, IS_GRAALPY
 
 
 class TestErr(HPyTest):
@@ -17,6 +18,7 @@ def test_NoMemory(self):
         with pytest.raises(MemoryError):
             mod.f()
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Fails transiently on GraalPy especially with xdist")
     def test_FatalError(self, python_subprocess, fatal_exit_code):
         mod = self.compile_module("""
             HPyDef_METH(f, "f", HPyFunc_NOARGS)
@@ -672,6 +674,7 @@ def do_not_raise_exception(*args):
         with pytest.raises(DummyException):
             mod.f(raise_exception, (DummyException, ), exc_types)
 
+    @pytest.mark.skipif(IS_GRAALPY, reason="Fails transiently on GraalPy especially with xdist")
     def test_HPyErr_WriteUnraisable(self, python_subprocess):
         mod = self.compile_module("""
             HPyDef_METH(f, "f", HPyFunc_NOARGS)
diff --git a/graalpython/hpy/test/test_hpyfield.py b/graalpython/hpy/test/test_hpyfield.py
@@ -145,7 +145,9 @@ def test_gc_track_no_gc_flag(self):
         assert not gc.is_tracked(p)
 
     def test_tp_traverse(self):
-        import sys
+        if self.is_graalpy:
+            import pytest
+            pytest.skip("Crashes on GraalPy")
         import gc
         mod = self.make_module("""
             @DEFINE_PairObject
@@ -308,6 +310,9 @@ def count_pairs():
         assert count_pairs() == 0
 
     def test_tp_finalize(self):
+        if self.is_graalpy:
+            import pytest
+            pytest.skip("Crashes on GraalPy")
         # Tests the contract of tp_finalize: what it should see
         # if called from within HPyField_Store
         mod = self.make_module("""
diff --git a/graalpython/hpy/test/test_hpytype.py b/graalpython/hpy/test/test_hpytype.py
@@ -1594,6 +1594,9 @@ class TestPureHPyType(HPyTest):
     ExtensionTemplate = PointTemplate
 
     def test_builtin_shape(self):
+        if self.is_graalpy:
+            import pytest
+            pytest.skip("Not yet implemented on GraalPy")
         mod = self.make_module("""
             @DEFINE_PointObject(HPyType_BuiltinShape_Long)
             @DEFINE_Point_xy
diff --git a/graalpython/hpy/test/test_object.py b/graalpython/hpy/test/test_object.py
@@ -532,6 +532,8 @@ def test_getitem_s(self):
 
     def test_getslice(self):
         import pytest
+        if self.is_graalpy:
+            pytest.skip("Not yet implemented on GraalPy")
         mod = self.make_module("""
             HPyDef_METH(f, "f", HPyFunc_VARARGS)
             static HPy f_impl(HPyContext *ctx, HPy self, const HPy *args, size_t nargs)
@@ -653,6 +655,8 @@ def test_setitem_s(self):
 
     def test_setslice(self):
         import pytest
+        if self.is_graalpy:
+            pytest.skip("Not yet implemented on GraalPy")
         mod = self.make_module("""
             HPyDef_METH(f, "f", HPyFunc_VARARGS)
             static HPy f_impl(HPyContext *ctx, HPy self, const HPy *args, size_t nargs)
@@ -786,6 +790,8 @@ def test_delitem(self):
 
     def test_delslice(self):
         import pytest
+        if self.is_graalpy:
+            pytest.skip("Not yet implemented on GraalPy")
         mod = self.make_module("""
             HPyDef_METH(f, "f", HPyFunc_VARARGS)
             static HPy f_impl(HPyContext *ctx, HPy self, const HPy *args, size_t nargs)
