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

8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head #372

Closed
wants to merge 2 commits into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Apr 27, 2022

The upstream patch for JDK-8284548 differs from the version in jdk17u-dev.
In particular the testcase is different. So I think we should update to the code in head to reduce diffs.


Progress

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

Issue

  • JDK-8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 372

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

Using diff file

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

Update JDK-8284548 patch with upstream changes.
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2022

👋 Welcome back clanger! 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 added the rfr label Apr 27, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Ok, basically a test replacement. May be helpful for future backports.

@openjdk
Copy link

openjdk bot commented Apr 28, 2022

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

8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head

Reviewed-by: mdoerr

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 label Apr 28, 2022
@openjdk openjdk bot removed the ready label May 2, 2022
@RealCLanger RealCLanger changed the title 8285726: Unify fix for JDK-8284548 with version from head 8285726: [11u, 17u] Unify fix for JDK-8284548 with version from head May 3, 2022
@openjdk openjdk bot added the ready label May 3, 2022
@RealCLanger
Copy link
Contributor Author

RealCLanger commented May 3, 2022

GHA failure gc/stringdedup/TestStringDeduplicationAgeThreshold.java#id1 on Linux/x86 is unrelated (and occurs sporadically).

@RealCLanger
Copy link
Contributor Author

RealCLanger commented May 6, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 6, 2022

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

  • e5a71d7: 8282929: Localized monetary symbols are not reflected in toLocalizedPattern return value
  • a839a36: 8286029: Add classpath exemption to globals_vectorApiSupport_***.S.inc
  • 75cfc99: 8284023: java.sun.awt.X11GraphicsDevice.getDoubleBufferVisuals() leaks XdbeScreenVisualInfo
  • cf2b20f: 8284532: Memory leak in BitSet::BitMapFragmentTable in JFR leak profiler
  • 70d3583: 8282170: JVMTI SetBreakpoint metaspace allocation test
  • 0955aca: 8285394: Compiler blackholes can be eliminated due to stale ciMethod::intrinsic_id()
  • db26df6: 8284549: JFR: FieldTable leaks FieldInfoTable member
  • a1da138: 8284620: CodeBuffer may leak _overflow_arena

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 6, 2022
@openjdk openjdk bot closed this May 6, 2022
@openjdk openjdk bot removed ready rfr labels May 6, 2022
@openjdk
Copy link

openjdk bot commented May 6, 2022

@RealCLanger Pushed as commit c464f20.

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

@RealCLanger RealCLanger deleted the jdk-8285726 branch May 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
2 participants