Skip to content

Conversation

@calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Feb 21, 2024

While generating holder classes (in generateHolderClasses()), don't add the MethodType to the invokerTypes if will fail the check in the build() method which would result in a RuntimeException.

Also updated the MethodHandlesInvokersTest.java under appcds/methodHandles and appcds/dynamicArchive/methodHandles to check that the "Failed to generate LambdaForm holder classes" error is not in the output;

Passed tiers 1 - 3 testing.


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-8314250: CDS dump error message: Invoker type parameter must start and end with Object: L3I_L (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17953

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17953.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 21, 2024

👋 Welcome back ccheung! 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
Copy link

openjdk bot commented Feb 21, 2024

@calvinccheung The following labels will be automatically applied to this pull request:

  • core-libs
  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Feb 21, 2024
@calvinccheung calvinccheung marked this pull request as ready for review March 6, 2024 01:08
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 6, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 6, 2024

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

Looks good. Just a small nit.


package java.lang.invoke;

//import jdk.internal.misc.CDS;
Copy link
Member

Choose a reason for hiding this comment

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

This line can be removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed.

@openjdk
Copy link

openjdk bot commented Mar 8, 2024

@calvinccheung 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:

8314250: CDS dump error message: Invoker type parameter must start and end with Object: L3I_L

Reviewed-by: iklam, matsaave

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 116 new commits pushed to the master branch:

  • 0a6e64e: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
  • c65d308: 8327812: JFR: Remove debug message in Function.Maximum
  • b9bc31f: 8327790: Improve javadoc for ResolvedJavaType.hasFinalizableSubclass
  • 18de932: 8325991: Accelerate Poly1305 on x86_64 using AVX2 instructions
  • d74b907: 8327093: Add truncate function to BitMap API
  • ffd43c9: 8327461: KeyStore getEntry is not thread-safe
  • 680ac2c: 8327689: RISC-V: adjust test filters of zfh extension
  • 570ad67: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 63dd6d1: 8327387: G1: Refactor region liveness processing after completion of concurrent marking
  • f2b5ffd: 8326578: Clean up networking properties documentation
  • ... and 106 more: https://git.openjdk.org/jdk/compare/43af12039f13b884ab632ab403691530996e961c...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Mar 8, 2024
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM! Please don't forget to address Ioi's nit before integration, thanks.

@calvinccheung
Copy link
Member Author

Thanks @iklam, @matias9927 for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 11, 2024

Going to push as commit 41450e9.
Since your change was applied there have been 116 commits pushed to the master branch:

  • 0a6e64e: 8327424: ProblemList serviceability/sa/TestJmapCore.java on all platforms with ZGC
  • c65d308: 8327812: JFR: Remove debug message in Function.Maximum
  • b9bc31f: 8327790: Improve javadoc for ResolvedJavaType.hasFinalizableSubclass
  • 18de932: 8325991: Accelerate Poly1305 on x86_64 using AVX2 instructions
  • d74b907: 8327093: Add truncate function to BitMap API
  • ffd43c9: 8327461: KeyStore getEntry is not thread-safe
  • 680ac2c: 8327689: RISC-V: adjust test filters of zfh extension
  • 570ad67: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 63dd6d1: 8327387: G1: Refactor region liveness processing after completion of concurrent marking
  • f2b5ffd: 8326578: Clean up networking properties documentation
  • ... and 106 more: https://git.openjdk.org/jdk/compare/43af12039f13b884ab632ab403691530996e961c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 11, 2024
@openjdk openjdk bot closed this Mar 11, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 11, 2024
@openjdk
Copy link

openjdk bot commented Mar 11, 2024

@calvinccheung Pushed as commit 41450e9.

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

@calvinccheung calvinccheung deleted the 8314250-dump-error branch March 11, 2024 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core-libs core-libs-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants