Skip to content

8240567: MethodTooLargeException thrown while creating a jlink image#65

Closed
mlchung wants to merge 3 commits into
openjdk:masterfrom
mlchung:mlchung-backport-ec7da91b
Closed

8240567: MethodTooLargeException thrown while creating a jlink image#65
mlchung wants to merge 3 commits into
openjdk:masterfrom
mlchung:mlchung-backport-ec7da91b

Conversation

@mlchung

@mlchung mlchung commented Aug 16, 2023 •
edited by openjdk Bot
Loading

Copy link
Copy Markdown
Member

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

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8240567: MethodTooLargeException thrown while creating a jlink image (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u.git pull/65/head:pull/65
$ git checkout pull/65

Update a local copy of the PR:
$ git checkout pull/65
$ git pull https://git.openjdk.org/jdk21u.git pull/65/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 65

View PR using the GUI difftool:
$ git pr show -t 65

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/65.diff

Webrev

Link to Webrev Comment

@bridgekeeper

bridgekeeper Bot commented Aug 16, 2023

Copy link
Copy Markdown

👋 Welcome back mchung! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk Bot changed the title Backport ec7da91bd83803b7d91a4de3a01caf0ba256c037 8240567: MethodTooLargeException thrown while creating a jlink image Aug 16, 2023
@openjdk

openjdk Bot commented Aug 16, 2023

Copy link
Copy Markdown

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk Bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 16, 2023
@mlbridge

mlbridge Bot commented Aug 16, 2023 •
edited
Loading

Copy link
Copy Markdown

Webrevs

This was referenced Aug 16, 2023
Closed
Closed
phohensee
phohensee reviewed Aug 16, 2023
View reviewed changes

@phohensee phohensee left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the definitions of MTD_StringArray and MTD_SystemModules in SystemModulesPlugin.java needed? They're not in the original commit and aren't referenced by the patch.

@mlchung

mlchung commented Aug 16, 2023

Copy link
Copy Markdown
Member Author

Thanks for catching this. It's improper merge. Now removed.

phohensee
phohensee approved these changes Aug 16, 2023
View reviewed changes

@phohensee phohensee left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing, looks good.

@phohensee

phohensee commented Aug 16, 2023

Copy link
Copy Markdown
Member

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

@openjdk

openjdk Bot commented Aug 16, 2023

Copy link
Copy Markdown

@mlchung This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8240567: MethodTooLargeException thrown while creating a jlink image

Reviewed-by: phh

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk Bot added the ready Pull request is ready to be integrated label Aug 16, 2023
@mlchung

mlchung commented Aug 17, 2023

Copy link
Copy Markdown
Member Author

/integrate

@openjdk

openjdk Bot commented Aug 17, 2023

Copy link
Copy Markdown

Going to push as commit 1e81fa5.

@openjdk openjdk Bot added the integrated Pull request has been integrated label Aug 17, 2023
@openjdk openjdk Bot closed this Aug 17, 2023
@openjdk openjdk Bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 17, 2023
@openjdk

openjdk Bot commented Aug 17, 2023

Copy link
Copy Markdown

@mlchung Pushed as commit 1e81fa5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@mlchung mlchung deleted the mlchung-backport-ec7da91b branch August 24, 2023 16:13
@Siedlerchr Siedlerchr mentioned this pull request Sep 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@phohensee phohensee phohensee approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mlchung @phohensee