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

[Mandy Chung]

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

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

Commit messages:
 - Backport ec7da91bd83803b7d91a4de3a01caf0ba256c037

Changes: https://git.openjdk.org/jdk21u/pull/65/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk21u&pr=65&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8240567
  Stats: 288 lines in 3 files changed: 269 ins; 1 del; 18 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