Backport e3aeebec1798b9adbb02e11f285951d4275c52e8

duke · duke · commit 3a223afea9f5 · 2025-08-18T08:15:17.000Z
diff --git a/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java b/src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java
@@ -186,7 +186,10 @@ public static HotSpotJVMCIRuntime runtime() {
                         // Can only do eager initialization of the JVMCI compiler
                         // once the singleton instance is available.
                         if (result.config.getFlag("EagerJVMCI", Boolean.class)) {
-                            result.getCompiler();
+                            // EagerJVMCI only applies to JVMCI when used by the CompileBroker.
+                            if (result.getCompilerToVM().isCompilerThread()) {
+                                result.getCompiler();
+                            }
                         }
                     }
                     // Ensures JVMCIRuntime::_HotSpotJVMCIRuntime_instance is

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,10 @@ public static HotSpotJVMCIRuntime runtime() {`
`186`	`186`	`// Can only do eager initialization of the JVMCI compiler`
`187`	`187`	`// once the singleton instance is available.`
`188`	`188`	`if (result.config.getFlag("EagerJVMCI", Boolean.class)) {`
`189`		`- result.getCompiler();`
	`189`	`+ // EagerJVMCI only applies to JVMCI when used by the CompileBroker.`
	`190`	`+ if (result.getCompilerToVM().isCompilerThread()) {`
	`191`	`+ result.getCompiler();`
	`192`	`+ }`
`190`	`193`	`}`
`191`	`194`	`}`
`192`	`195`	`// Ensures JVMCIRuntime::_HotSpotJVMCIRuntime_instance is`