[GR-63253] Adopt the new unchained standalones for GraalPy

PullRequest: graalpython/3734

Author: eregon

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "33e51c9c3ed51884956280ef1d96f88f96669921" }
+{ "overlay": "c228c8e9f7b989c0a911200c91f7ab92a1d7d46d" }

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

@@ -50,13 +50,13 @@ call_traverse(traverseproc traverse, PyObject *op, visitproc visit, void *arg)
         return 0;
     } else {
         if (_PyObject_IsFreed(op)) {
-            PyTruffle_Log(PY_TRUFFLE_LOG_INFO,
+            PyTruffle_Log(PY_TRUFFLE_LOG_FINE,
                           "we tried to call tp_traverse on a freed object at %p (ctx %p)!",
                           op, arg);
             return 0;
         }
         if (_PyObject_IsFreed((PyObject *)Py_TYPE(op))) {
-            PyTruffle_Log(PY_TRUFFLE_LOG_INFO,
+            PyTruffle_Log(PY_TRUFFLE_LOG_FINE,
                           "we tried to call tp_traverse on an object at %p with a freed type at %p (ctx %p)!",
                           op, Py_TYPE(op), arg);
             return 0;

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

@@ -2688,7 +2688,8 @@ _decref_notify(const PyObject *op, const Py_ssize_t updated_refcnt)
             GraalPyTruffle_BulkNotifyRefCount(deferred_notify_ops, DEFERRED_NOTIFY_SIZE);
         }
 #else
-        GraalPyTruffle_BulkNotifyRefCount(&op, 1);
+        PyObject *nonConstOp = (PyObject *)op;
+        GraalPyTruffle_BulkNotifyRefCount(&nonConstOp, 1);
 #endif
     }
 }

graalpython/lib-graalpython/modules/standalone/__main__.py

@@ -418,8 +418,8 @@ def build_binary(target_dir, ni, jc, modules_path, launcher_file, parsed_args):
             ]
         cmd += [
             "--no-fallback",
-            "-H:-CopyLanguageResources",
             "-H:+UnlockExperimentalVMOptions",
+            "-H:-CopyLanguageResources",
             f"-H:ResourceConfigurationFiles={target_dir}/{NATIVE_IMAGE_RESOURCES_FILE}",
             "-o",
             output,

mx.graalpython/graalpython-svm-standalone

@@ -1,5 +1,3 @@
-GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools
-COMPONENTS=GraalVM Python,suite:tools
-INSTALLABLES=GraalVM Python
-BUILD_TARGETS=GRAALVM_STANDALONES
+BUILD_TARGETS=GRAALPY_JVM_STANDALONE
+EXCLUDE_TRUFFLE_RUNTIME=true

mx.graalpython/jvm

@@ -1,5 +1,2 @@
-GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler
-COMPONENTS=GraalVM Python,suite:tools,GraalVM compiler
-INSTALLABLES=GraalVM Python
-BUILD_TARGETS=GRAALVM_STANDALONES
+BUILD_TARGETS=GRAALPY_JVM_STANDALONE

mx.graalpython/jvm-ce

@@ -1,6 +1,5 @@
-GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
-COMPONENTS=GraalVM Python,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
+BUILD_TARGETS=GRAALPY_JVM_STANDALONE
+COMPONENTS=LibGraal
 NATIVE_IMAGES=lib:jvmcicompiler
-INSTALLABLES=GraalVM Python
-BUILD_TARGETS=GRAALVM_STANDALONES
+GRAALVM_SKIP_ARCHIVE=true

mx.graalpython/jvm-ce-libgraal

@@ -1,7 +1,2 @@
-GRAALVM_SKIP_ARCHIVE=true
-DYNAMIC_IMPORTS=/tools,/graalpython-enterprise,/graal-enterprise,/vm-enterprise,/sulong-managed,/substratevm-enterprise
-COMPONENTS=GraalVM Python,suite:tools,GraalVM enterprise compiler,Truffle enterprise,GraalVM enterprise license files,LLVM Runtime Native Enterprise,SubstrateVM Enterprise
-NATIVE_IMAGES=false
-INSTALLABLES=GraalVM Python
-BUILD_TARGETS=GRAALVM_STANDALONES
-# NOTE: SVM EE is added as a workaround to tell the JVM standalone to be EE
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise
+BUILD_TARGETS=GRAALPY_JVM_STANDALONE

mx.graalpython/jvm-ee

@@ -1,6 +1,5 @@
-GRAALVM_SKIP_ARCHIVE=true
-DYNAMIC_IMPORTS=/tools,/graalpython-enterprise,/graal-enterprise,/vm-enterprise,/sulong-managed,/substratevm-enterprise
-COMPONENTS=GraalVM Python,suite:tools,GraalVM enterprise compiler,Truffle enterprise,GraalVM enterprise license files,LLVM Runtime Native Enterprise,SubstrateVM Enterprise,LibGraal Enterprise
+DYNAMIC_IMPORTS=/tools,/graal-enterprise,/truffle-enterprise,/vm-enterprise,/substratevm-enterprise
+BUILD_TARGETS=GRAALPY_JVM_STANDALONE
+COMPONENTS=LibGraal Enterprise
 NATIVE_IMAGES=lib:jvmcicompiler
-INSTALLABLES=GraalVM Python
-BUILD_TARGETS=GRAALVM_STANDALONES
+GRAALVM_SKIP_ARCHIVE=true