[jdk21u] RFR: 8240567: MethodTooLargeException thrown while creating a jlink image [v3]
Mandy Chung
mchung at openjdk.org
Wed Aug 16 23:21:17 UTC 2023
> Manually resolved the merge conflict due to JDK-8310848 which is not in jdk21u. Trivial 1-line change:
>
>
> diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
> index 1ec5f750f4c..563371b05a1 100644
> --- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
> +++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java
> @@ -685,7 +685,7 @@ public final class SystemModulesPlugin extends AbstractPlugin {
> if (moduleInfos.size() <= moduleDescriptorsPerMethod) {
> clb.withMethodBody(
> "moduleDescriptors",
> - MTD_ModuleDescriptorArray,
> + MethodTypeDesc.of(CD_MODULE_DESCRIPTOR.arrayType()),
> ACC_PUBLIC,
> cob -> {
> cob.constantInstruction(moduleInfos.size())
Mandy Chung has updated the pull request incrementally with one additional commit since the last revision:
trigger pre-submit runs
-------------
Changes:
- all: https://git.openjdk.org/jdk21u/pull/65/files
- new: https://git.openjdk.org/jdk21u/pull/65/files/cb527294..67101b29
Webrevs:
- full: https://webrevs.openjdk.org/?repo=jdk21u&pr=65&range=02
- incr: https://webrevs.openjdk.org/?repo=jdk21u&pr=65&range=01-02
Stats: 0 lines in 0 files changed: 0 ins; 0 del; 0 mod
Patch: https://git.openjdk.org/jdk21u/pull/65.diff
Fetch: git fetch https://git.openjdk.org/jdk21u.git pull/65/head:pull/65
PR: https://git.openjdk.org/jdk21u/pull/65
More information about the jdk-updates-dev
mailing list