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

[Paul Hohensee]

On Wed, 16 Aug 2023 21:21:22 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())
>
> Mandy Chung has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Remove unused imports.  Review feedback

Thanks for fixing, looks good.

Also, please enable pre-submit testing on your repo and run it.

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

Marked as reviewed by phh (Reviewer).

PR Review: https://git.openjdk.org/jdk21u/pull/65#pullrequestreview-1581500367
PR Comment: https://git.openjdk.org/jdk21u/pull/65#issuecomment-1681330782