Skip to content

[JDK-8345826] Adapt JDK-8345826: Do not automatically resolve jdk.internal.vm.ci when libgraal is used #11239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: galahad
Choose a base branch
from
Open

[JDK-8345826] Adapt JDK-8345826: Do not automatically resolve jdk.internal.vm.ci when libgraal is used #11239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c6c81
Adapt JDK-8345826: Do not automatically resolve jdk.internal.vm.ci wh…
dougxc May 15, 2025
6985af6
Update galahad jdk
dougxc May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+24-2946", "platformspecific": true, "extrabundles": ["static-libs"]},
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+24-2964", "platformspecific": true, "extrabundles": ["static-libs"]},

"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
Expand Down
3 changes: 3 additions & 0 deletions sdk/mx.sdk/mx_sdk_vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,9 @@ 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'])
# -XX:+EnableJVMCI must be explicitly specified to the java launcher to add
# jdk.internal.vm.ci to the root set (JDK-8345826)
vm_options.append('-XX:+EnableJVMCI')
if threads is not None and threads != 1:
vm_options.append('-XX:JVMCIThreadsPerNativeLibraryRuntime=1')
if default_to_jvmci == 'lib':
Expand Down
Loading