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

8278065: Refactor subclassAudits to use ClassValue #899

Closed
wants to merge 3 commits into from

Conversation

rkennke
Copy link
Contributor

@rkennke rkennke commented Mar 16, 2022

This backports the fix for JDK-8278065, which fixes a number of small issues with the preceding change for JDK-8277072.
The original change has baked for several weeks in jdk19 and applies with some conflicts caused by different context.

Testing:

  • tier1
  • tier2
  • tier3

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8278065: Refactor subclassAudits to use ClassValue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/899/head:pull/899
$ git checkout pull/899

Update a local copy of the PR:
$ git checkout pull/899
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/899/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 899

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/899.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 16, 2022

👋 Welcome back rkennke! A progress list of the required criteria for merging this PR into pr/869 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 8fed8ab29cae4f189f44609c23f116967eef6bdf 8278065: Refactor subclassAudits to use ClassValue Mar 16, 2022
@openjdk
Copy link

openjdk bot commented Mar 16, 2022

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

@openjdk openjdk bot added backport rfr labels Mar 16, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 16, 2022

Webrevs

@rkennke
Copy link
Contributor Author

rkennke commented Mar 28, 2022

@RogerRiggs @plevart If you find some time, could you please review this backport? Thank you!

@GoeLin
Copy link
Member

GoeLin commented Apr 1, 2022

Pre-submit failures; gcc issues, unrelated.

@plevart
Copy link
Contributor

plevart commented Apr 1, 2022

Looks good.

plevart
plevart approved these changes Apr 1, 2022
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/869 to master Apr 1, 2022
@openjdk-notifier
Copy link

openjdk-notifier bot commented Apr 1, 2022

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout rkennke-backport-8eb453ba
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@rkennke this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout backport-JDK-8278065
git fetch https://git.openjdk.java.net/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict label Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

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

8278065: Refactor subclassAudits to use ClassValue

Reviewed-by: rriggs, plevart

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 ready and removed merge-conflict labels Apr 1, 2022
@rkennke
Copy link
Contributor Author

rkennke commented Apr 1, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

Going to push as commit 01c4d3f.
Since your change was applied there has been 1 commit pushed to the master branch:

  • b1f18cb: 8280041: Retry loop issues in java.io.ClassCache

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Apr 1, 2022
@openjdk openjdk bot closed this Apr 1, 2022
@openjdk openjdk bot removed ready rfr labels Apr 1, 2022
@rkennke rkennke deleted the backport-JDK-8278065 branch Apr 1, 2022
@openjdk
Copy link

openjdk bot commented Apr 1, 2022

@rkennke Pushed as commit 01c4d3f.

💡 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
backport integrated
4 participants