Use fully optional Truffle resources

Author: steve-s

graalpython/com.oracle.graal.python.resources/src/com/oracle/graal/python/resources/PythonResource.java

@@ -48,14 +48,13 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.InternalResource;
-import com.oracle.truffle.api.InternalResource.Id;
 
 /**
  * This code needs to be kept in sync somehow with the suite.py code. In particular, the layouts
  * produced by the unpacking logic in {@link #unpackFiles} should produce the same layout as the
  * GRAALPYTHON_GRAALVM_SUPPORT distribution in the suite.py.
  */
-@Id("python-home")
+@InternalResource.Id(value = "python-home", componentId = "python", optional = true)
 public final class PythonResource implements InternalResource {
     private static final int PYTHON_MAJOR;
     private static final int PYTHON_MINOR;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -86,7 +86,6 @@
 import com.oracle.graal.python.pegparser.sst.ModTy;
 import com.oracle.graal.python.pegparser.sst.StmtTy;
 import com.oracle.graal.python.pegparser.tokenizer.SourceRange;
-import com.oracle.graal.python.resources.PythonResource;
 import com.oracle.graal.python.runtime.GilNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.PythonThreadState;
@@ -148,7 +147,6 @@
                 interactive = true, internal = false, //
                 contextPolicy = TruffleLanguage.ContextPolicy.SHARED, //
                 fileTypeDetectors = PythonFileDetector.class, //
-                internalResources = PythonResource.class, //
                 website = "https://www.graalvm.org/python/")
 @ProvidedTags({
                 StandardTags.CallTag.class,
@@ -187,17 +185,6 @@ public final class PythonLanguage extends TruffleLanguage<PythonContext> {
     public static final int GRAALVM_MAJOR = 23;
     public static final int GRAALVM_MINOR = 1;
 
-    public static final Class<PythonResource> PYTHON_RESOURCE_CLASS;
-
-    @SuppressWarnings("unchecked")
-    private static Class<PythonResource> getPythonResourceClass() {
-        try {
-            return (Class<PythonResource>) Class.forName("com.oracle.graal.python.resources.PythonResource");
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-    }
-
     static {
         switch (RELEASE_LEVEL) {
             case RELEASE_LEVEL_ALPHA:
@@ -214,7 +201,6 @@ private static Class<PythonResource> getPythonResourceClass() {
                 RELEASE_LEVEL_STRING = tsLiteral("final");
         }
 
-        PYTHON_RESOURCE_CLASS = getPythonResourceClass();
         try (InputStream is = PythonLanguage.class.getResourceAsStream("/graalpy_versions")) {
             int ch;
             if (MAJOR != (ch = is.read() - ' ')) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -1699,17 +1699,14 @@ public void initializeHomeAndPrefixPaths(Env newEnv, String languageHome) {
         }
 
         Supplier<?>[] homeCandidates = new Supplier<?>[]{
+                        () -> home,
                         () -> {
-                            return home;
-                        },
-                        () -> {
-                            if (PythonLanguage.PYTHON_RESOURCE_CLASS != null && !ImageInfo.inImageCode()) {
-                                try {
-                                    homeResourcesFile = newEnv.getInternalResource(PythonLanguage.PYTHON_RESOURCE_CLASS).getAbsoluteFile();
-                                    return homeResourcesFile;
-                                } catch (IOException e) {
-                                    // fall through
-                                }
+                            try {
+                                TruffleFile internalResource = newEnv.getInternalResource("python-home");
+                                homeResourcesFile = internalResource == null ? null : internalResource.getAbsoluteFile();
+                                return homeResourcesFile;
+                            } catch (IOException e) {
+                                // fall through
                             }
                             return null;
                         }

mx.graalpython/mx_graalpython.py

@@ -2160,7 +2160,6 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
     }},
     truffle_jars=[
         'graalpython:GRAALPYTHON',
-        'graalpython:GRAALPYTHON_RESOURCES',
         'graalpython:BOUNCYCASTLE-PROVIDER',
         'graalpython:BOUNCYCASTLE-PKIX',
         'graalpython:BOUNCYCASTLE-UTIL',

mx.graalpython/suite.py

@@ -393,7 +393,6 @@
             "dependencies": [
                 "com.oracle.graal.python.annotations",
                 "com.oracle.graal.python.pegparser",
-                "com.oracle.graal.python.resources",
                 "truffle:TRUFFLE_API",
                 "truffle:TRUFFLE_NFI",
                 "tools:TRUFFLE_PROFILER",
@@ -908,9 +907,6 @@
             "platformDependent": False,
             "moduleInfo": {
                 "name": "org.graalvm.py.resources",
-                "exports": [
-                    "com.oracle.graal.python.resources to org.graalvm.py",
-                ],
             },
             # "useModulePath": True,
             "dependencies": [
@@ -950,9 +946,6 @@
                 "uses": [
                     "com.oracle.graal.python.builtins.PythonBuiltins",
                 ],
-                "requires": [
-                    "static org.graalvm.py.resources",
-                ],
             },
             # "useModulePath": True,
             "dependencies": [
@@ -968,7 +961,6 @@
                 "sulong:SULONG_API",
                 "sulong:SULONG_NATIVE",  # this is actually just a runtime dependency
                 "truffle:TRUFFLE_ICU4J",
-                "GRAALPYTHON_RESOURCES", # overridden below to make this an optional dependency
             ],
             "requires": [
                 "java.base",