From fb1adbe4d60273637e92ea12c1dde52b7c405470 Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Wed, 28 May 2025 16:23:15 +0200 Subject: [PATCH 1/2] use class file version one behind JDK master for JVMCI --- make/modules/jdk.internal.vm.ci/Java.gmk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/make/modules/jdk.internal.vm.ci/Java.gmk b/make/modules/jdk.internal.vm.ci/Java.gmk index cb569bb88170c..87f3dea41b575 100644 --- a/make/modules/jdk.internal.vm.ci/Java.gmk +++ b/make/modules/jdk.internal.vm.ci/Java.gmk @@ -27,10 +27,12 @@ DISABLED_WARNINGS_java += dangling-doc-comments this-escape +VERSION_JVMCI = $(shell $(EXPR) $(VERSION_FEATURE) - 1 ) + # -parameters provides method's parameters information in class file, # JVMCI compilers make use of that information for various sanity checks. # Don't use Indy strings concatenation to have good JVMCI startup performance. -JAVAC_FLAGS += -parameters -XDstringConcat=inline +JAVAC_FLAGS += -parameters -XDstringConcat=inline --source $(VERSION_JVMCI) --target $(VERSION_JVMCI) ################################################################################ From 739c5fb56d91011628107bad070d22b48fe93c13 Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Mon, 2 Jun 2025 18:54:59 +0200 Subject: [PATCH 2/2] use BOOT_JDK_SOURCETARGET instead --- make/modules/jdk.internal.vm.ci/Java.gmk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/make/modules/jdk.internal.vm.ci/Java.gmk b/make/modules/jdk.internal.vm.ci/Java.gmk index 87f3dea41b575..5e92f349a64e5 100644 --- a/make/modules/jdk.internal.vm.ci/Java.gmk +++ b/make/modules/jdk.internal.vm.ci/Java.gmk @@ -27,12 +27,14 @@ DISABLED_WARNINGS_java += dangling-doc-comments this-escape -VERSION_JVMCI = $(shell $(EXPR) $(VERSION_FEATURE) - 1 ) +# Target an older JDK so JVMCI class files can be read by Native Image +# running on an older JDK. +JVMCI_SOURCETARGET = $(BOOT_JDK_SOURCETARGET) # -parameters provides method's parameters information in class file, # JVMCI compilers make use of that information for various sanity checks. # Don't use Indy strings concatenation to have good JVMCI startup performance. -JAVAC_FLAGS += -parameters -XDstringConcat=inline --source $(VERSION_JVMCI) --target $(VERSION_JVMCI) +JAVAC_FLAGS += -parameters -XDstringConcat=inline $(JVMCI_SOURCETARGET) ################################################################################