Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8332505: JEP 457: ClassRemapper forgets to remap bootstrap method references #19299

Closed
wants to merge 1 commit into from

Conversation

asotona
Copy link
Member

@asotona asotona commented May 20, 2024

Class-File API ClassRemapper component suppose to remap all classes referenced in a class file.
Actual implementation missed remapping of bootstrap methods referenced from invokedynamic instructions.
This patch fixes the remapping and adds relevant test.

Please review.

Thanks,
Adam


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-8332505: JEP 457: ClassRemapper forgets to remap bootstrap method references (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19299

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 20, 2024

👋 Welcome back asotona! 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 May 20, 2024

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

8332505: JEP 457: ClassRemapper forgets to remap bootstrap method references

Reviewed-by: jlahoda

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

  • cabe337: 8331921: Hotspot assembler files should use common logic to setup exported functions
  • 2edb6d9: 8330386: Replace Opaque4Node of Initialized Assertion Predicate with new OpaqueInitializedAssertionPredicateNode
  • 1850914: 8332864: Parallel: Merge ParMarkBitMapClosure into MoveAndUpdateClosure
  • 2f2cf38: 8332883: Some simple cleanup in vectornode.cpp
  • b5e1615: 8292955: Collections.checkedMap Map.merge does not properly check key and value
  • 86eb5d9: 8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition
  • be1d374: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • ed81a47: 8327964: Simplify BigInteger.implMultiplyToLen intrinsic
  • 08face8: 8332890: Module imports don't work inside the same module
  • 793fd72: 8332956: Problem list CodeCacheFullCountTest.java until JDK-8332954 is fixed
  • ... and 100 more: https://git.openjdk.org/jdk/compare/b92bd671835c37cff58e2cdcecd0fe4277557d7f...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 rfr Pull request is ready for review label May 20, 2024
@openjdk
Copy link

openjdk bot commented May 20, 2024

@asotona The following label will be automatically applied to this pull request:

  • core-libs

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label May 20, 2024
@mlbridge
Copy link

mlbridge bot commented May 20, 2024

Webrevs

Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 28, 2024
@asotona
Copy link
Member Author

asotona commented May 28, 2024

/integrate

@openjdk
Copy link

openjdk bot commented May 28, 2024

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

  • cabe337: 8331921: Hotspot assembler files should use common logic to setup exported functions
  • 2edb6d9: 8330386: Replace Opaque4Node of Initialized Assertion Predicate with new OpaqueInitializedAssertionPredicateNode
  • 1850914: 8332864: Parallel: Merge ParMarkBitMapClosure into MoveAndUpdateClosure
  • 2f2cf38: 8332883: Some simple cleanup in vectornode.cpp
  • b5e1615: 8292955: Collections.checkedMap Map.merge does not properly check key and value
  • 86eb5d9: 8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition
  • be1d374: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • ed81a47: 8327964: Simplify BigInteger.implMultiplyToLen intrinsic
  • 08face8: 8332890: Module imports don't work inside the same module
  • 793fd72: 8332956: Problem list CodeCacheFullCountTest.java until JDK-8332954 is fixed
  • ... and 100 more: https://git.openjdk.org/jdk/compare/b92bd671835c37cff58e2cdcecd0fe4277557d7f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 28, 2024

@asotona Pushed as commit aa4c83a.

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

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 integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants