[GR-50050][GR-50451] Build native image with assertions when running CI gates

PullRequest: graalpython/3056

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "8462b258e6f0a8ec9586086df1cd0fca1165a989" }
+{ "overlay": "fad71a4294ba5cae680c5aca72c4f71a8ec3920b" }

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

@@ -819,10 +819,9 @@ PyUnicode_InternInPlace(PyObject **p)
     }
 
     if (t != s) {
-        Py_INCREF(t);
-        Py_SETREF(*p, t);
-        return;
+        *p = t;
     }
+    Py_DECREF(s);
 }
 
 // 15940

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

@@ -76,12 +76,6 @@ public void none() {
         Assert.assertEquals(AT_FDCWD.value, call(PNone.NO_VALUE));
     }
 
-    @Test
-    public void noValue() {
-        expectPythonMessage("TypeError: argument must be an int, or have a fileno() method.");
-        call(PNone.NO_VALUE);
-    }
-
     @Test
     public void fdBool() {
         Assert.assertEquals(0, call(false));

graalpython/com.oracle.graal.python.test/src/graalpytest.py

@@ -400,6 +400,8 @@ def run_safely(self, func, print_immediately=False):
                     func(*arg_vec)
             else:
                 func()
+        except KeyboardInterrupt:
+            raise
         except BaseException as e:
             if isinstance(e, SkipTest):
                 return _skipped_marker
@@ -718,6 +720,8 @@ def load_module(self, path):
                 for p in pkg[1:]:
                     test_module = getattr(test_module, p)
                 test_module = getattr(test_module, name)
+            except KeyboardInterrupt:
+                raise
             except BaseException as e:
                 _, _, tb = sys.exc_info()
                 try:
@@ -738,6 +742,8 @@ def load_module(self, path):
                 with _io.FileIO(path, "r") as f:
                     test_module.__file__ = path
                     exec(compile(f.readall(), path, "exec"), test_module.__dict__)
+            except KeyboardInterrupt:
+                raise
             except BaseException as e:
                 self.exceptions.append((path, e))
             else:
@@ -838,6 +844,11 @@ class TestSuite:
 
 if __name__ == "__main__":
     sys.modules["unittest"] = sys.modules["__main__"]
+
+    if sys.implementation.name == 'graalpy' and os.environ.get(b"GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS") != b"true":
+        if not __graalpython__.java_assert():
+            sys.exit("Java assertions are not enabled, refusing to run. Set GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS=true to disable this check")
+
     patterns = []
     argv = sys.argv[:]
     idx = 0
@@ -846,12 +857,12 @@ class TestSuite:
             argv.pop(idx)
             try:
                 import json
-            except:
+            except Exception:
                 print("--report needs working json module")
                 raise
             try:
                 reportfile = [argv.pop(idx),]
-            except:
+            except Exception:
                 print("--report needs argument path to the json output")
                 raise
         elif argv[idx] == "-k":

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

@@ -1030,18 +1030,21 @@ def compile_module(self, name):
         cmpfunc=unhandled_error_compare
     )
 
+
 class TestUnicodeObject(object):
     def test_intern(self):
         TestIntern = CPyExtType(
             "TestIntern",
             '''
             static PyObject* set_intern_str(PyObject* self, PyObject* str) {
+                Py_INCREF(str);
                 PyUnicode_InternInPlace(&str);
                 ((TestInternObject*)self)->str = str;
                 return str;
             }
 
             static PyObject* check_is_same_str_ptr(PyObject* self, PyObject* str) {
+                Py_INCREF(str);
                 PyUnicode_InternInPlace(&str);
                 if (str == ((TestInternObject*)self)->str) {
                     Py_RETURN_TRUE;
@@ -1057,6 +1060,7 @@ def test_intern(self):
             ''',
         )
         tester = TestIntern()
-        s = 'some text'
-        assert tester.set_intern_str(s) == s
-        assert tester.check_is_same_str_ptr(s)
+        s1 = b'some text'.decode('ascii')
+        s2 = b'some text'.decode('ascii')
+        assert tester.set_intern_str(s1) == s2
+        assert tester.check_is_same_str_ptr(s2)

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

@@ -80,9 +80,3 @@ def test_wait():
         res = wait([b, x], 3)
         assert res == [x], "res3"
         assert x.recv() == 33, "res4"
-        a.send(1)
-        y.send(2)
-        res = wait([b, x], 3)
-        assert set(res) == {b, x}
-        assert b.recv() == 1
-        assert x.recv() == 2

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

@@ -179,6 +179,8 @@ def test_descr_call_with_none():
     descr = object.__dict__['__class__']
     assert None.__class__ is type(None)
     assert descr.__get__(None, type(None)) is descr
+    assert None.__repr__() == 'None'
+    assert None.__bool__() is False
     assert_raises(TypeError, descr.__get__, None, None)
 
 def test_custom_getattribute():
@@ -224,4 +226,4 @@ def __getattribute__(self, name):
                 return super().__getattribute__(name)
 
     d = {"abc": 1}
-    assert dict(BBB(d)) == d
+    assert dict(BBB(d)) == d

graalpython/com.oracle.graal.python.test/src/tests/try-test.py

@@ -33,6 +33,7 @@
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
+import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.random.PRandom;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallBinaryNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -65,7 +66,7 @@ abstract static class PRandomNode extends PythonBuiltinNode {
         PRandom random(VirtualFrame frame, Object cls, Object seed,
                         @Cached PythonObjectFactory factory) {
             PRandom random = factory.createRandom(cls);
-            setSeed.executeObject(frame, random, seed);
+            setSeed.executeObject(frame, random, seed != PNone.NO_VALUE ? seed : PNone.NONE);
             return random;
         }
     }

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

@@ -308,7 +308,7 @@ private PythonCextBuiltinRegistry() {
     public static final CApiBuiltinExecutable PyTruffleUnicode_DecodeUTF8Stateful = new CApiBuiltinExecutable("PyTruffleUnicode_DecodeUTF8Stateful", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.Pointer, ArgDescriptor.Py_ssize_t, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Int}, 247);
     public static final CApiBuiltinExecutable PyTruffleUnicode_FromUCS = new CApiBuiltinExecutable("PyTruffleUnicode_FromUCS", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.Pointer, ArgDescriptor.Py_ssize_t, ArgDescriptor.Int}, 248);
     public static final CApiBuiltinExecutable PyTruffleUnicode_FromUTF = new CApiBuiltinExecutable("PyTruffleUnicode_FromUTF", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.Pointer, ArgDescriptor.Py_ssize_t, ArgDescriptor.Int}, 249);
-    public static final CApiBuiltinExecutable PyTruffleUnicode_LookupAndIntern = new CApiBuiltinExecutable("PyTruffleUnicode_LookupAndIntern", CApiCallPath.Ignored, ArgDescriptor.PyObject, new ArgDescriptor[]{ArgDescriptor.PyObject}, 250);
+    public static final CApiBuiltinExecutable PyTruffleUnicode_LookupAndIntern = new CApiBuiltinExecutable("PyTruffleUnicode_LookupAndIntern", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject}, 250);
     public static final CApiBuiltinExecutable PyTruffleUnicode_New = new CApiBuiltinExecutable("PyTruffleUnicode_New", CApiCallPath.Ignored, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.Pointer, ArgDescriptor.Py_ssize_t, ArgDescriptor.Py_ssize_t, ArgDescriptor.PY_UCS4}, 251);
     public static final CApiBuiltinExecutable PyTruffle_AddInheritedSlots = new CApiBuiltinExecutable("PyTruffle_AddInheritedSlots", CApiCallPath.Ignored, ArgDescriptor.Void, new ArgDescriptor[]{ArgDescriptor.PyTypeObject}, 252);
     public static final CApiBuiltinExecutable PyTruffle_Arg_ParseArrayAndKeywords = new CApiBuiltinExecutable("PyTruffle_Arg_ParseArrayAndKeywords", CApiCallPath.Ignored, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.Pointer, ArgDescriptor.Py_ssize_t, ArgDescriptor.PyObject, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Pointer, ArgDescriptor.Pointer}, 253);
@@ -381,7 +381,7 @@ private PythonCextBuiltinRegistry() {
     public static final CApiBuiltinExecutable PyUnicode_FromObject = new CApiBuiltinExecutable("PyUnicode_FromObject", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject}, 320);
     public static final CApiBuiltinExecutable PyUnicode_FromOrdinal = new CApiBuiltinExecutable("PyUnicode_FromOrdinal", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.Int}, 321);
     public static final CApiBuiltinExecutable PyUnicode_FromString = new CApiBuiltinExecutable("PyUnicode_FromString", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString}, 322);
-    public static final CApiBuiltinExecutable PyUnicode_FromWideChar = new CApiBuiltinExecutable("PyUnicode_FromWideChar", CApiCallPath.Direct, ArgDescriptor.PyObject, new ArgDescriptor[]{ArgDescriptor.CONST_WCHAR_PTR, ArgDescriptor.Py_ssize_t}, 323);
+    public static final CApiBuiltinExecutable PyUnicode_FromWideChar = new CApiBuiltinExecutable("PyUnicode_FromWideChar", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.CONST_WCHAR_PTR, ArgDescriptor.Py_ssize_t}, 323);
     public static final CApiBuiltinExecutable PyUnicode_Join = new CApiBuiltinExecutable("PyUnicode_Join", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.PyObject}, 324);
     public static final CApiBuiltinExecutable PyUnicode_ReadChar = new CApiBuiltinExecutable("PyUnicode_ReadChar", CApiCallPath.Direct, ArgDescriptor.PY_UCS4, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.Py_ssize_t}, 325);
     public static final CApiBuiltinExecutable PyUnicode_Replace = new CApiBuiltinExecutable("PyUnicode_Replace", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.PyObject, ArgDescriptor.PyObject, ArgDescriptor.Py_ssize_t}, 326);
@@ -391,9 +391,9 @@ private PythonCextBuiltinRegistry() {
     public static final CApiBuiltinExecutable PyWeakref_GetObject = new CApiBuiltinExecutable("PyWeakref_GetObject", CApiCallPath.Direct, ArgDescriptor.PyObjectBorrowed, new ArgDescriptor[]{ArgDescriptor.PyObject}, 330);
     public static final CApiBuiltinExecutable PyWeakref_NewRef = new CApiBuiltinExecutable("PyWeakref_NewRef", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.PyObject}, 331);
     public static final CApiBuiltinExecutable Py_AtExit = new CApiBuiltinExecutable("Py_AtExit", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.func_voidvoid}, 332);
-    public static final CApiBuiltinExecutable Py_CompileString = new CApiBuiltinExecutable("Py_CompileString", CApiCallPath.Direct, ArgDescriptor.PyObject, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Int}, 333);
-    public static final CApiBuiltinExecutable Py_CompileStringExFlags = new CApiBuiltinExecutable("Py_CompileStringExFlags", CApiCallPath.Direct, ArgDescriptor.PyObject, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Int, ArgDescriptor.PY_COMPILER_FLAGS, ArgDescriptor.Int}, 334);
-    public static final CApiBuiltinExecutable Py_CompileStringObject = new CApiBuiltinExecutable("Py_CompileStringObject", CApiCallPath.Direct, ArgDescriptor.PyObject, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.PyObject, ArgDescriptor.Int, ArgDescriptor.PY_COMPILER_FLAGS, ArgDescriptor.Int}, 335);
+    public static final CApiBuiltinExecutable Py_CompileString = new CApiBuiltinExecutable("Py_CompileString", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Int}, 333);
+    public static final CApiBuiltinExecutable Py_CompileStringExFlags = new CApiBuiltinExecutable("Py_CompileStringExFlags", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.Int, ArgDescriptor.PY_COMPILER_FLAGS, ArgDescriptor.Int}, 334);
+    public static final CApiBuiltinExecutable Py_CompileStringObject = new CApiBuiltinExecutable("Py_CompileStringObject", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.ConstCharPtrAsTruffleString, ArgDescriptor.PyObject, ArgDescriptor.Int, ArgDescriptor.PY_COMPILER_FLAGS, ArgDescriptor.Int}, 335);
     public static final CApiBuiltinExecutable Py_EnterRecursiveCall = new CApiBuiltinExecutable("Py_EnterRecursiveCall", CApiCallPath.Direct, ArgDescriptor.Int, new ArgDescriptor[]{ArgDescriptor.ConstCharPtr}, 336);
     public static final CApiBuiltinExecutable Py_GenericAlias = new CApiBuiltinExecutable("Py_GenericAlias", CApiCallPath.Direct, ArgDescriptor.PyObjectTransfer, new ArgDescriptor[]{ArgDescriptor.PyObject, ArgDescriptor.PyObject}, 337);
     public static final CApiBuiltinExecutable Py_LeaveRecursiveCall = new CApiBuiltinExecutable("Py_LeaveRecursiveCall", CApiCallPath.Direct, ArgDescriptor.Void, new ArgDescriptor[]{}, 338);