git: openjdk/leyden: hermetic-java-runtime: 2 new changesets

[duke]

Changeset: f605992d
Author:    Jiangli Zhou <jianglizhou at google.com>
Date:      2023-09-27 16:48:06 +0000
URL:       https://git.openjdk.org/leyden/commit/f605992d58fcab3416d561a622238250a78a3e72

Ignore -server|-client options in Arguments::parse_each_vm_init_arg when executing in hermetic Java mode.

As part of the CreateExecutionEnvironment operations, CheckJvmType checks for VM types (known types specified in lib/jvm.cfg) for normal non-hermetic Java execution mode. A side effect of CheckJvmType is the removal of -server|-client options if they exist in the command-line options. Arguments::parse_each_vm_init_arg would report 'Unrecognized option' error when encounters these options.

With hermetic Java/JDK static linking, CreateExecutionEnvironment operations are skipped as they are not necessary. As a result, Arguments::parse_each_vm_init_arg may see -server|-client if the options exist in the command line when running in hermetic Java mode. This fix changes Arguments::parse_each_vm_init to not report error for -server|-client options.

! src/hotspot/share/runtime/arguments.cpp

Changeset: 4e8b2eb6
Author:    Jiangli Zhou <jianglizhou at google.com>
Date:      2023-09-29 15:48:57 +0000
URL:       https://git.openjdk.org/leyden/commit/4e8b2eb65bbaea8dacfc51133cacf24de94d6742

Use JavaHome.EXECUTABLE field for storing the hermetic executable name/path.

The hermetic executable is the hermetic JAR (as the JAVA_HOME) by default. Launcher may set jdk.internal.misc.hermetic.executable property value, which is retrieved and stored in JavaHome.EXECUTABLE.

! src/java.base/share/classes/jdk/internal/misc/JavaHome.java