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

8331855: Convert jdk.jdeps jdeprscan and jdeps to use the Classfile API #19193

Closed
wants to merge 2 commits into from

Conversation

liach
Copy link
Member

@liach liach commented May 11, 2024

Summary of the changes:

  • Moved com.sun.tools.classfile.Dependency and Dependencies to jdeps; they are exclusively used by jdeps in sources, and they are not used in any tests too. This will ease the removal of com.sun.tools.classfile later.
  • A few visitor patterns have been rewritten with pattern matching, notably in:
    • CPEntries/CPSelector (removed)
    • Dependencies.BasicDependencyFinder.Visitor has been rewritten to use pattern matching to capture dependencies.
  • MethodSig and its tests have been removed in favor of MethodTypeDesc.
  • Otherwise, the changes are mostly mechanical replacements.

All tests in test/langtools/tools/jdeprscan and test/langtools/tools/jdeps pass.


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-8331855: Convert jdk.jdeps jdeprscan and jdeps to use the Classfile API (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19193

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 11, 2024

👋 Welcome back liach! 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 11, 2024

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

8331855: Convert jdk.jdeps jdeprscan and jdeps to use the Classfile API

Reviewed-by: asotona

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

  • 0b0445b: 8331724: Refactor j.l.constant implementation to internal package
  • d84a8fd: 8332327: Return _methods_jmethod_ids field back in VMStructs
  • f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
  • 14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
  • ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
  • 6422efa: 8332394: Add friendly output when @ir rule missing value
  • 9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
  • 7c750fd: 8331746: Create a test to verify that the cmm id is not ignored
  • de57d4b: 8332257: Shenandoah: Move evacuation methods to implementation file
  • da9c23a: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • ... and 55 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@asotona) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label May 11, 2024
@openjdk
Copy link

openjdk bot commented May 11, 2024

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

  • compiler
  • core-libs

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 core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels May 11, 2024
@mlbridge
Copy link

mlbridge bot commented May 11, 2024

Webrevs

@liach
Copy link
Member Author

liach commented May 13, 2024

@asotona Requesting your review for this and the other test migration patch.

Copy link
Member

@asotona asotona 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 to me, thanks!

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

liach commented May 17, 2024

Thanks for the review!

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 17, 2024
@openjdk
Copy link

openjdk bot commented May 17, 2024

@liach
Your change (at version be8c25b) is now ready to be sponsored by a Committer.

@asotona
Copy link
Member

asotona commented May 17, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented May 17, 2024

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

  • beeffd4: 8332109: Convert remaining tests using com.sun.tools.classfile to ClassFile API
  • e0d1c4b: 8321428: Deprecate for removal the package java.beans.beancontext
  • 0b0445b: 8331724: Refactor j.l.constant implementation to internal package
  • d84a8fd: 8332327: Return _methods_jmethod_ids field back in VMStructs
  • f1ce9b0: 8331557: Serial: Refactor SerialHeap::do_collection
  • 14198f5: 8329653: JLILaunchTest fails on AIX after JDK-8329131
  • ae999ea: 8129418: JShell: better highlighting of errors in imports on demand
  • 6422efa: 8332394: Add friendly output when @ir rule missing value
  • 9160ef8: 8332237: [nmt] Remove the need for ThreadStackTracker::track_as_vm()
  • 7c750fd: 8331746: Create a test to verify that the cmm id is not ignored
  • ... and 57 more: https://git.openjdk.org/jdk/compare/32c7681cf310c87669c502c4a8b62a7fecc93360...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 17, 2024

@asotona @liach Pushed as commit d4c2edf.

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

@liach liach deleted the fix/jdeps-cf branch July 11, 2024 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org 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