Merge branch 'ss/fix-hpy-tests'

Author: fangerer

graalpython/com.oracle.graal.python.jni/src/hpy_jni.c

@@ -332,36 +332,32 @@ static double augment_Long_AsDouble(HPyContext *ctx, HPy h) {
 }
 
 static HPy augment_Long_FromLong(HPyContext *ctx, long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLong(HPyContext *ctx, unsigned long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromLongLong(HPyContext *ctx, long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromLongLong(ctx, l);
     }
 }
 
 static HPy augment_Long_FromUnsignedLongLong(HPyContext *ctx, unsigned long long l) {
-    int32_t i = (int32_t) l;
-    if (l == i) {
-        return toPtr(boxInt(i));
+    if (isBoxableUnsignedInt(l)) {
+        return toPtr(boxInt((int32_t) l));
     } else {
         return original_Long_FromUnsignedLongLong(ctx, l);
     }

graalpython/com.oracle.graal.python.jni/src/hpy_jni.h

@@ -47,6 +47,7 @@
 
 #include <hpy.h>
 #include <jni.h>
+#include <stdint.h>
 
 //*************************
 // BOXING
@@ -65,6 +66,8 @@
 #define unboxHandle(value) (value)
 #define boxHandle(handle) (handle)
 
+#define isBoxableInt(value) (INT32_MIN < (value) && (value) < INT32_MAX)
+#define isBoxableUnsignedInt(value) ((value) < INT32_MAX)
 #define unboxInt(value) ((int32_t) ((value) - NAN_BOXING_INT))
 #define boxInt(value) ((((uint64_t) (value)) & NAN_BOXING_INT_MASK) + NAN_BOXING_INT)
 

graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_invalid.py

@@ -175,6 +175,7 @@ def test_keeping_and_reusing_argument_handle(compiler, hpy_debug_capture):
     assert hpy_debug_capture.invalid_handles_count == 1
 
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 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")

graalpython/lib-graalpython/modules/hpy/test/debug/test_handles_leak.py

@@ -135,6 +135,7 @@ def test_leak_from_method(compiler):
     leaks = [dh.obj for dh in _debug.get_open_handles(gen)]
     assert leaks == ["a"]
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_DebugHandle_id(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)
@@ -183,6 +184,7 @@ def test_DebugHandle_compare(compiler):
     with pytest.raises(TypeError):
         a1 < 'hello'
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_DebugHandle_repr(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)
@@ -215,6 +217,7 @@ def test_LeakDetector(compiler):
     assert 'hello' not in msg
     assert 'world' not in msg
 
+@pytest.mark.xfail(reason="set_handle_stack_trace_limit not implemented yet")
 def test_closed_handles(compiler, with_alloc_trace):
     from hpy.universal import _debug
     mod = make_leak_module(compiler)

graalpython/lib-graalpython/modules/hpy/test/support.py

@@ -317,8 +317,8 @@ def change_compiler(conf, cc, cxx, stdlib):
                     cxx = join(llvm_toolchain_vanilla, 'clang++')
                     stdlib = "libc++"
                 else:
-                    cc = join(os.path.sep, 'usr', 'bin', 'gcc')
-                    cxx = join(os.path.sep, 'usr', 'bin', 'g++')
+                    cc = 'gcc'
+                    cxx = 'g++'
                     stdlib = None
             change_compiler(conf, cc, cxx, stdlib)