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

8325326: [PPC64] Don't relocate in case of allocation failure #311

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Mar 1, 2024

Clean backport of JDK-8325326.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8325326 needs maintainer approval

Issue

  • JDK-8325326: [PPC64] Don't relocate in case of allocation failure (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/311/head:pull/311
$ git checkout pull/311

Update a local copy of the PR:
$ git checkout pull/311
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/311/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 311

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/311.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 1, 2024

👋 Welcome back mdoerr! 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 changed the title Backport 4388095cde20dec602ada9fe2977f1a359ceab91 8325326: [PPC64] Don't relocate in case of allocation failure Mar 1, 2024
@openjdk
Copy link

openjdk bot commented Mar 1, 2024

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

@openjdk
Copy link

openjdk bot commented Mar 1, 2024

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 1, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request JDK 21 is affected by this bug. The fix is small, only touches one PPC64 file and applies cleanly. It has been tested in head for some time and retested in 22u and 21u-dev. No regression found.

@openjdk
Copy link

openjdk bot commented Mar 2, 2024

@TheRealMDoerr
8325326: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Mar 2, 2024
@GoeLin
Copy link
Member

GoeLin commented Mar 6, 2024

Hi @TheRealMDoerr , your tests are red. I checked them for you ... unrelated Risc-V build issue.

@openjdk
Copy link

openjdk bot commented Mar 6, 2024

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

8325326: [PPC64] Don't relocate in case of allocation failure

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

  • 930344a: Merge
  • 29bf21f: 8322750: Test "api/java_awt/interactive/SystemTrayTests.html" failed because A blue ball icon is added outside of the system tray
  • 4244cb0: 8306040: HttpResponseInputStream.available() returns 1 on empty stream
  • d6ad625: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 2d62854: 8320343: Generate GIF images for AbstractButton/5049549/bug5049549.java
  • fdbed07: 8325862: set -XX:+ErrorFileToStderr when executing java in containers for some container related jtreg tests
  • dbcce04: 8323519: Add applications/ctw/modules to Hotspot tiered testing
  • 500d85a: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • ee6445c: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 ready Pull request is ready to be integrated and removed approval labels Mar 6, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 8, 2024

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

  • c26cad3: 8278527: java/util/concurrent/tck/JSR166TestCase.java fails nanoTime test
  • 315d051: 8314828: Mark 3 jcmd command-line options test as vm.flagless
  • ab6e027: 8320712: Rewrite BadFactoryTest in pure Java
  • 40f0254: 8323276: StressDirListings.java fails on AIX
  • d4823c2: 8322477: order of subclasses in the permits clause can differ between compilations
  • 0b01feb: 8319757: java/nio/channels/DatagramChannel/InterruptibleOrNot.java failed: wrong exception thrown
  • e7994c1: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
  • 5838aed: 8314824: Fix serviceability/jvmti/8036666/GetObjectLockCount.java to use vm flags
  • 45e20c5: 8311792: java/net/httpclient/ResponsePublisher.java fails intermittently with AssertionError: Found some outstanding operations
  • 2267292: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
  • ... and 17 more: https://git.openjdk.org/jdk21u-dev/compare/94634c08e6eaecbdb61223d390c1fc4f8ebab848...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 8, 2024

@TheRealMDoerr Pushed as commit c4c4b22.

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

Successfully merging this pull request may close these issues.

2 participants