Update HPy inlined files: b0fbdf73

Author: timfel

graalpython/com.oracle.graal.python.hpy.llvm/include/hpy/version.h

@@ -1,7 +1,6 @@
 import pytest
 from .support import ExtensionCompiler, DefaultExtensionTemplate,\
     PythonSubprocessRunner, HPyDebugCapture, make_hpy_abi_fixture
-from hpy.debug.leakdetector import LeakDetector
 from pathlib import Path
 
 IS_VALGRIND_RUN = False
@@ -48,6 +47,7 @@ def leakdetector(hpy_abi):
     """
     Automatically detect leaks when the hpy_abi == 'debug'
     """
+    from hpy.debug.leakdetector import LeakDetector
     if 'debug' in hpy_abi:
         with LeakDetector() as ld:
             yield ld

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/conftest.py

@@ -1,6 +1,6 @@
 import os
 import pytest
-from test.support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
+from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
 
 # 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
@@ -293,4 +293,4 @@ def clear_raw_data_in_closed_handles():
             assert h.raw_data_size == -1
     finally:
         _debug.set_protected_raw_data_max_size(old_raw_data_max_size)
-        _debug.set_closed_handles_queue_max_size(old_closed_handles_max_size)
+        _debug.set_closed_handles_queue_max_size(old_closed_handles_max_size)

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/debug/__init__.py

@@ -1,14 +1,17 @@
 import pytest
+import sys
 from hpy.debug.leakdetector import LeakDetector
-from test.support import SUPPORTS_SYS_EXECUTABLE, IS_PYTHON_DEBUG_BUILD
-from test.conftest import IS_VALGRIND_RUN
+from ..support import SUPPORTS_SYS_EXECUTABLE, IS_PYTHON_DEBUG_BUILD
+from ..conftest import IS_VALGRIND_RUN
 
 @pytest.fixture
 def hpy_abi():
     with LeakDetector():
         yield "debug"
 
 
+@pytest.mark.skipif(sys.implementation.name == 'pypy',
+    reason="Cannot recover from use-after-close on pypy")
 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("""
@@ -33,6 +36,8 @@ def test_no_invalid_handle(compiler, hpy_debug_capture):
     assert hpy_debug_capture.invalid_handles_count == 0
 
 
+@pytest.mark.skipif(sys.implementation.name == 'pypy',
+    reason="Cannot recover from use-after-close on pypy")
 def test_cant_use_closed_handle(compiler, hpy_debug_capture):
     mod = compiler.make_module("""
         HPyDef_METH(f, "f", HPyFunc_O, .doc="double close")
@@ -106,6 +111,8 @@ def test_cant_use_closed_handle(compiler, hpy_debug_capture):
         assert hpy_debug_capture.invalid_handles_count == 6
 
 
+@pytest.mark.skipif(sys.implementation.name == 'pypy',
+    reason="Cannot recover from use-after-close on pypy")
 def test_keeping_and_reusing_argument_handle(compiler, hpy_debug_capture):
     mod = compiler.make_module("""
         HPy keep;
@@ -197,4 +204,4 @@ def test_invalid_handle_crashes_python_if_no_hook(compiler, python_subprocess, f
     """)
     result = python_subprocess.run(mod, "mod.f(42);")
     assert result.returncode == fatal_exit_code
-    assert b"Invalid usage of already closed handle" in result.stderr
+    assert b"Invalid usage of already closed handle" in result.stderr

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/debug/test_charptr.py

@@ -1,5 +1,5 @@
 import pytest
-from test.support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
+from ..support import SUPPORTS_SYS_EXECUTABLE, SUPPORTS_MEM_PROTECTION
 
 @pytest.fixture
 def hpy_abi():

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/debug/test_handles_invalid.py

@@ -16,7 +16,7 @@
 import py
 import pytest
 
-from test.support import atomic_run, HPY_ROOT
+from ..support import atomic_run, HPY_ROOT
 
 # ====== IMPORTANT DEVELOPMENT TIP =====
 # You can use py.test --reuse-venv to speed up local testing.

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/debug/test_misc.py

@@ -49,16 +49,19 @@ def make_hpy_abi_fixture(ABIs, class_fixture=False):
     class TestFoo(HPyTest):
         hpy_abi = make_hpy_abi_fixture('with hybrid', class_fixture=True)
     """
-    if ABIs == 'default':
-        ABIs = ['cpython', 'universal', 'debug']
-    elif ABIs == 'with hybrid':
-        ABIs = ['cpython', 'hybrid', 'hybrid+debug']
-    elif isinstance(ABIs, list):
+    is_cpython = not hasattr(sys, "implementation") or sys.implementation.name == 'cpython'
+    if isinstance(ABIs, list):
         pass
     else:
-        raise ValueError("ABIs must be 'default', 'with hybrid' "
-                         "or a list of strings. Got: %s" % ABIs)
-
+        if ABIs == 'default':
+            ABIs = ['universal', 'debug']
+        elif ABIs == 'with hybrid':
+            ABIs = ['hybrid', 'hybrid+debug']
+        else:
+            raise ValueError("ABIs must be 'default', 'with hybrid' "
+                             "or a list of strings. Got: %s" % ABIs)
+        if is_cpython:
+            ABIs.append('cpython')
     if class_fixture:
         @pytest.fixture(params=ABIs)
         def hpy_abi(self, request):
@@ -495,15 +498,6 @@ def supports_ordinary_make_module_imports(self):
         """
         return True
 
-    def supports_refcounts(self):
-        """ Returns True if the underlying Python implementation supports
-            the vectorcall protocol.
-
-            By default, this returns True for Python version 3.8+ on all
-            implementations.
-        """
-        return sys.version_info >= (3, 8)
-
 
 class HPyDebugCapture:
     """

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/hpy_devel/__init__.py

@@ -8,7 +8,6 @@
 """
 from .support import HPyTest
 from hpy.devel.abitag import HPY_ABI_VERSION, HPY_ABI_VERSION_MINOR
-import shutil
 
 
 class TestBasic(HPyTest):
@@ -48,6 +47,7 @@ def test_abi_version_check(self):
             assert False, "Expected exception"
 
     def test_abi_tag_check(self):
+        import shutil
         if self.compiler.hpy_abi != 'universal':
             return
 
@@ -262,6 +262,7 @@ def test_builtin_handles(self):
                     case 20: h = ctx->h_MemoryViewType; break;
                     case 21: h = ctx->h_SliceType; break;
                     case 22: h = ctx->h_Builtins; break;
+                    case 23: h = ctx->h_DictType; break;
                     case 2048: h = ctx->h_CapsuleType; break;
                     default:
                         HPyErr_SetString(ctx, ctx->h_ValueError, "invalid choice");
@@ -278,7 +279,7 @@ def test_builtin_handles(self):
             '<NULL>', None, False, True, ValueError, TypeError, IndexError,
             SystemError, object, type, bool, int, float, str, tuple, list,
             NotImplemented, Ellipsis, complex, bytes, memoryview, slice,
-            builtins.__dict__
+            builtins.__dict__, dict
         )
         for i, obj in enumerate(builtin_objs):
             if i == 0:
@@ -560,3 +561,20 @@ def test_leave_python(self):
             @INIT
         """)
         assert mod.f("abraka") == 3
+
+    def test_dup_null(self):
+        mod = self.make_module("""
+            HPyDef_METH(f, "f", HPyFunc_NOARGS)
+            static HPy f_impl(HPyContext *ctx, HPy self)
+            {
+                HPy h = HPy_Dup(ctx, HPy_NULL);
+                if (HPy_IsNull(h)) {
+                    return HPyLong_FromSize_t(ctx, 0);
+                }
+                HPy_Close(ctx, h);
+                return HPyLong_FromSize_t(ctx, -1);
+            }
+            @EXPORT(f)
+            @INIT
+        """)
+        assert mod.f() == 0

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/hpy_devel/test_distutils.py

@@ -75,7 +75,7 @@ def test_s(self):
             "function a str is required"
         )
 
-    def test_B(self):
+    def test_upper_b(self):
         mod = self.make_parse_item("B", "char", "char_to_hpybytes")
         assert mod.f(0) == b"\x00"
         assert mod.f(1) == b"\x01"
@@ -102,7 +102,7 @@ def test_h(self):
             "function signed short integer is less than minimum"
         )
 
-    def test_H_short(self):
+    def test_upper_h_short(self):
         mod = self.make_parse_item("H", "short", "HPyLong_FromLong")
         assert mod.f(0) == 0
         assert mod.f(1) == 1
@@ -114,7 +114,7 @@ def test_H_short(self):
         assert mod.f(2**16) == 0
         assert mod.f(-2**16) == 0
 
-    def test_H_unsigned_short(self):
+    def test_upper_h_unsigned_short(self):
         mod = self.make_parse_item(
             "H", "unsigned short", "HPyLong_FromUnsignedLong"
         )
@@ -147,7 +147,7 @@ def test_i(self):
             "Python int too large to convert to C long",  # where sizeof(long) == 4
         )
 
-    def test_I_signed(self):
+    def test_upper_i_signed(self):
         mod = self.make_parse_item("I", "int", "HPyLong_FromLong")
         assert mod.f(0) == 0
         assert mod.f(1) == 1
@@ -159,7 +159,7 @@ def test_I_signed(self):
         assert mod.f(2**32) == 0
         assert mod.f(-2**32) == 0
 
-    def test_I_unsigned(self):
+    def test_upper_i_unsigned(self):
         mod = self.make_parse_item(
             "I", "unsigned int", "HPyLong_FromUnsignedLong"
         )
@@ -211,7 +211,7 @@ def test_k_unsigned(self):
         assert mod.f(2**ULONG_BITS) == 0
         assert mod.f(-2**ULONG_BITS) == 0
 
-    def test_L(self):
+    def test_upper_l(self):
         import pytest
         mod = self.make_parse_item("L", "long long", "HPyLong_FromLongLong")
         assert mod.f(0) == 0
@@ -224,7 +224,7 @@ def test_L(self):
         with pytest.raises(OverflowError):
             mod.f(-2**63 - 1)
 
-    def test_K_signed(self):
+    def test_upper_k_signed(self):
         mod = self.make_parse_item("K", "long long", "HPyLong_FromLongLong")
         assert mod.f(0) == 0
         assert mod.f(1) == 1
@@ -236,7 +236,7 @@ def test_K_signed(self):
         assert mod.f(2**64) == 0
         assert mod.f(-2**64) == 0
 
-    def test_K_unsigned(self):
+    def test_upper_k_unsigned(self):
         mod = self.make_parse_item(
             "K", "unsigned long long", "HPyLong_FromUnsignedLongLong"
         )
@@ -277,7 +277,7 @@ def test_d(self):
         with pytest.raises(TypeError):
             mod.f("x")
 
-    def test_O(self):
+    def test_upper_o(self):
         mod = self.make_parse_item("O", "HPy", "HPy_Dup")
         assert mod.f("a") == "a"
         assert mod.f(5) == 5

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/support.py

@@ -156,6 +156,7 @@ class TestHPyCapsule(HPyTest):
     ExtensionTemplate = CapsuleTemplate
 
     def test_capsule_new(self):
+        import pytest
         mod = self.make_module("""
             @DEFINE_SomeObject
             @DEFINE_Capsule_New
@@ -178,6 +179,7 @@ def test_capsule_new(self):
             mod.capsule_new()
 
     def test_capsule_getter_and_setter(self):
+        import pytest
         mod = self.make_module("""
             #include <string.h>
 
@@ -385,6 +387,7 @@ def test_capsule_getter_and_setter(self):
             mod.capsule_freename(p)
 
     def test_capsule_isvalid(self):
+        import pytest
         mod = self.make_module("""
             @DEFINE_SomeObject
             @DEFINE_Capsule_New
@@ -455,6 +458,7 @@ def test_capsule_new_with_destructor(self):
         assert mod.pointer_freed()
 
     def test_capsule_new_with_invalid_destructor(self):
+        import pytest
         mod = self.make_module("""
             static HPyCapsule_Destructor mydtor = { NULL, NULL };
 

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/test_00_basic.py

@@ -1,9 +1,9 @@
-from textwrap import dedent
 from .support import HPyTest
 
 class TestEval(HPyTest):
     def test_compile(self):
         import pytest
+        from textwrap import dedent
         mod = self.make_module("""
             HPyDef_METH(f, "f", HPyFunc_VARARGS)
             static HPy f_impl(HPyContext *ctx, HPy self, const HPy *args, size_t nargs)

graalpython/com.oracle.graal.python.hpy.test/src/hpytest/test_argparse.py

@@ -326,6 +326,7 @@ def test_tp_finalize(self):
             // nicely with pytest, but if the finalizer gets called after the
             // test has finished, we have no choice but to abort to signal
             // the error
+            static void on_unexpected_finalize_call(void);
             static void on_unexpected_finalize_call() {
                 if (test_finished)
                     abort();
@@ -420,4 +421,4 @@ def test_tp_finalize(self):
         owner.set_a(42)
         from gc import collect
         collect()
-        assert mod.check_finalize_calls()
+        assert mod.check_finalize_calls()