[GR-59029] Fix coverage after sulong managed removal.

timfel · timfel · commit 5560c3c5558d · 2024-10-15T08:08:01.000Z
PullRequest: graalpython/3514
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ language runtime. The main focus is on user-observable behavior of the engine.
 ** Foreign lists now inherit from Python `list`, foreign dictionaries from `dict`, foreign iterators from `iterator`, foreign exceptions from `BaseException` and foreign none/null from `NoneType`.
 ** This means all Python methods of these types are available on the corresponding foreign objects, which behave as close as possible as if they were Python objects.
 ** See [the documentation](https://github.com/oracle/graalpython/blob/master/docs/user/Interoperability.md#interacting-with-foreign-objects-from-python-scripts) for more information.
+* Remove support for running with Sulong managed both in embeddings as well as through the `graalpy-managed` launcher.
 
 ## Version 24.1.0
 * GraalPy is now considered stable for pure Python workloads. While many workloads involving native extension modules work, we continue to consider them experimental. You can use the command-line option `--python.WarnExperimentalFeatures` to enable warnings for such modules at runtime. In Java embeddings the warnings are enabled by default and you can suppress them by setting the context option 'python.WarnExperimentalFeatures' to 'false'.
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1 +1 @@
-{ "overlay": "5f2c190a2db5461ac877a32df039c3584ae08148" }
+{ "overlay": "9b1a2dbacd9cb2b783a4d267e283377be0bb7f8b" }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java
@@ -32,6 +32,7 @@
 import static com.oracle.graal.python.nodes.BuiltinNames.T_NT;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_STDERR;
 import static com.oracle.graal.python.nodes.BuiltinNames.T_SYS;
+import static com.oracle.graal.python.nodes.BuiltinNames.T_ZIPIMPORT;
 import static com.oracle.graal.python.nodes.BuiltinNames.T__WEAKREF;
 import static com.oracle.graal.python.nodes.BuiltinNames.T___BUILTINS__;
 import static com.oracle.graal.python.nodes.BuiltinNames.T___IMPORT__;
@@ -45,6 +46,8 @@
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.io.IOException;
+import java.io.StringWriter;
+import java.io.PrintWriter;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -373,6 +376,7 @@
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonImageBuildOptions;
 import com.oracle.graal.python.runtime.PythonOptions;
+import com.oracle.graal.python.runtime.exception.ExceptionUtils;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.interop.PythonMapScope;
 import com.oracle.graal.python.runtime.object.PythonObjectSlowPathFactory;
@@ -914,6 +918,7 @@ private void initializeJavaCore() {
     private void initializeImportlib() {
         PythonModule bootstrap = ImpModuleBuiltins.importFrozenModuleObject(this, T__FROZEN_IMPORTLIB, false);
         PythonModule bootstrapExternal;
+        boolean useFrozenModules = bootstrap != null;
 
         PyObjectCallMethodObjArgs callNode = PyObjectCallMethodObjArgs.getUncached();
         WriteAttributeToPythonObjectNode writeNode = WriteAttributeToPythonObjectNode.getUncached();
@@ -923,8 +928,7 @@ private void initializeImportlib() {
         // first, a workaround since postInitialize hasn't run yet for the _weakref module aliases
         writeNode.execute(lookupBuiltinModule(T__WEAKREF), T_REF, lookupType(PythonBuiltinClassType.PReferenceType));
 
-        if (bootstrap == null) {
-            // true when the frozen module is not available
+        if (!useFrozenModules) {
             bootstrapExternal = createModule(T_IMPORTLIB_BOOTSTRAP_EXTERNAL);
             bootstrap = createModule(T_IMPORTLIB_BOOTSTRAP);
             loadFile(toTruffleStringUncached("importlib/_bootstrap_external"), getContext().getStdlibHome(), bootstrapExternal);
@@ -964,11 +968,25 @@ private void initializeImportlib() {
                 LOGGER.log(Level.FINE, () -> "initializing zipimport failed");
             } else {
                 LOGGER.log(Level.FINE, () -> "# installing zipimport hook");
+                // when frozen modules are not used, we need to load from file directly
                 PythonModule zipimport = null;
                 try {
-                    zipimport = AbstractImportNode.importModule(toTruffleStringUncached("zipimport"));
-                } catch (PException e) {
-                    LOGGER.log(Level.FINE, () -> "# can't import zipimport");
+                    if (useFrozenModules) {
+                        zipimport = AbstractImportNode.importModule(T_ZIPIMPORT);
+                    } else {
+                        // load zipimport from file, and since postInitialize hasn't run yet we
+                        // cannot use the normal import machinery without frozen modules at this
+                        // point
+                        zipimport = createModule(T_ZIPIMPORT);
+                        loadFile(T_ZIPIMPORT, getContext().getStdlibHome(), zipimport);
+                        setItem.execute(null, null, sysModules, T_ZIPIMPORT, zipimport);
+                    }
+                } catch (RuntimeException e) {
+                    LOGGER.log(Level.FINE, () -> {
+                        StringWriter tb = new StringWriter();
+                        ExceptionUtils.printPythonLikeStackTrace(new PrintWriter(tb), e);
+                        return tb.toString() + System.lineSeparator() + "# can't import zipimport";
+                    });
                 }
                 if (zipimport != null) {
                     writeNode.execute(zipimport, T___BUILTINS__, getBuiltins());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/BuiltinNames.java
@@ -302,6 +302,8 @@ public abstract class BuiltinNames {
 
     public static final TruffleString T___IMPORT__ = tsLiteral("__import__");
 
+    public static final TruffleString T_ZIPIMPORT = tsLiteral("zipimport");
+
     public static final String J_COMPLEX = "complex";
 
     public static final String J_HASATTR = "hasattr";
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -893,10 +893,9 @@ def graalpy_standalone_home(standalone_type, enterprise=False, dev=False, build=
     svm_component = '_SVM'
     if enterprise:
         env_file = 'ee-python'
-        try:
-            vm_suite_path = os.path.join(mx.suite('graal-enterprise').dir, '..', 'vm-enterprise')
-        except:
-            vm_suite_path = os.path.join(SUITE.dir, '..', 'graal-enterprise', 'vm-enterprise')
+        enterprise_suite = mx.suite('graal-enterprise', fatalIfMissing=False)
+        enterprise_suite_dir = enterprise_suite.dir if enterprise_suite else os.path.join(SUITE.dir, '..', 'graal-enterprise', 'graal-enterprise')
+        vm_suite_path = os.path.join(enterprise_suite_dir, '..', 'vm-enterprise')
         svm_component = '_SVM_SVMEE'
     if dev:
         if standalone_type == 'jvm':
@@ -2570,6 +2569,7 @@ def python_coverage(args):
         else:
             variants = [
                 {"args": []},
+                {"args": SANDBOXED_OPTIONS},
                 {"args": ["--python.EmulateJython"], "paths": ["test_interop.py"]},
                 {"hpy": True},
             ]
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -5,7 +5,7 @@
     #  METADATA
     #
     # --------------------------------------------------------------------------------------------------------------
-    "mxversion": "7.27.0",
+    "mxversion": "7.33.0",
     "name": "graalpython",
     "versionConflictResolution": "latest",
 
@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "64d3e5d973f1d1b9c05f2408a7896efbad7d0157",
+                "version": "3ee833a230e5af859f1289fbe5161a9abf422ec7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "64d3e5d973f1d1b9c05f2408a7896efbad7d0157",
+                "version": "3ee833a230e5af859f1289fbe5161a9abf422ec7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "64d3e5d973f1d1b9c05f2408a7896efbad7d0157",
+                "version": "3ee833a230e5af859f1289fbe5161a9abf422ec7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "64d3e5d973f1d1b9c05f2408a7896efbad7d0157",
+                "version": "3ee833a230e5af859f1289fbe5161a9abf422ec7",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{ "overlay": "5f2c190a2db5461ac877a32df039c3584ae08148" }`
	`1`	`+{ "overlay": "9b1a2dbacd9cb2b783a4d267e283377be0bb7f8b" }`