tmp: FLAG_IS_JIMAGE_RESOURCE

Author: dougxc

common.json

@@ -46,10 +46,10 @@
     "oraclejdk23":       {"name": "jpg-jdk",   "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+22", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "jpg-jdk",   "version": "25",      "build_id": "2025-05-16-2109577.doug.simon.open", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "jpg-jdk",   "version": "25",      "build_id": "2025-05-17-2228274.doug.simon.open", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+22-jvmci-b01-debug", "platformspecific": true },
     "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+22-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "jpg-jdk",   "version": "25",      "build_id": "2025-05-16-2109577.doug.simon.open", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ee-latest":      {"name": "jpg-jdk",   "version": "25",      "build_id": "2025-05-17-2228274.doug.simon.open", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+22-jvmci-b01-debug", "platformspecific": true },
     "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+22-jvmci-b01-sulong", "platformspecific": true }
   },

sdk/mx.sdk/mx_sdk_vm.py

@@ -827,12 +827,11 @@ def _get_image_vm_options(jdk, use_upgrade_module_path, modules, synthetic_modul
         if default_to_jvmci or 'jdk.graal.compiler' in non_synthetic_modules:
             threads = get_JVMCIThreadsPerNativeLibraryRuntime(jdk)
             vm_options.extend(['-XX:+UnlockExperimentalVMOptions', '-XX:+EnableJVMCIProduct'])
+            # As of JDK-8345826, the JVMCI module must be explicitly added to the root set
+            vm_options.append('-XX:+EnableJVMCI')
             if threads is not None and threads != 1:
                 vm_options.append('-XX:JVMCIThreadsPerNativeLibraryRuntime=1')
             if default_to_jvmci == 'lib':
-                # As of JDK-8345826, the JVMCI module must be explicitly
-                # added to the root set if libgraal is in use
-                vm_options.append('--add-modules=jdk.internal.vm.ci')
                 vm_options.append('-XX:+UseJVMCINativeLibrary')
             vm_options.extend(['-XX:-UnlockExperimentalVMOptions'])
             import mx_sdk_vm_impl