[jdk21u] Integrated: 8240567: MethodTooLargeException thrown while creating a jlink image

[Mandy Chung]

On Wed, 16 Aug 2023 18:19:12 GMT, Mandy Chung <mchung at openjdk.org> wrote:

> 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())

This pull request has now been integrated.

Changeset: 1e81fa55
Author:    Mandy Chung <mchung at openjdk.org>
URL:       https://git.openjdk.org/jdk21u/commit/1e81fa55d5f4b08f9354a3283f719140369289dc
Stats:     286 lines in 3 files changed: 267 ins; 1 del; 18 mod

8240567: MethodTooLargeException thrown while creating a jlink image

Reviewed-by: phh
Backport-of: ec7da91bd83803b7d91a4de3a01caf0ba256c037

-------------

PR: https://git.openjdk.org/jdk21u/pull/65