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

8286346: 3-parameter version of AllocateHeap should not ignore AllocFailType #1399

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented May 25, 2023

Clean backport to resolve the regression since JDK 11 due to JDK-8199698. Also unblocks the backport of JDK-8286331.

Additional testing:

  • Linux x86_64 fastdebug tier1 tier2 tier3

Progress

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

Issue

  • JDK-8286346: 3-parameter version of AllocateHeap should not ignore AllocFailType

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1399

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 25, 2023

👋 Welcome back shade! 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 64b05ccbed7879dd38a49453a6098bfe9729ee76 8286346: 3-parameter version of AllocateHeap should not ignore AllocFailType May 25, 2023
@openjdk
Copy link

openjdk bot commented May 25, 2023

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

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

8286346: 3-parameter version of AllocateHeap should not ignore AllocFailType

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

  • 0d2cc35: 8292713: Unsafe.allocateInstance should be intrinsified without UseUnalignedAccesses
  • 5bf1b9a: 8283520: JFR: Memory leak in dcmd_arena
  • c581886: 8307128: Open source some drag and drop tests 4
  • 14779b1: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • 57d0a7f: 8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors
  • 436d96f: 8275287: Relax memory ordering constraints on updating instance class and array class counters
  • 50aabaa: 8307347: serviceability/sa/ClhsdbDumpclass.java could leave files owned by root on macOS

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 rfr Pull request is ready for review labels May 25, 2023
@mlbridge
Copy link

mlbridge bot commented May 25, 2023

Webrevs

@shipilev
Copy link
Member Author

Testing is clean, push approval is here.

/integrate

@openjdk
Copy link

openjdk bot commented May 26, 2023

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

  • 6803da9: 8301661: Enhance os::pd_print_cpu_info on macOS and Windows
  • 0d2cc35: 8292713: Unsafe.allocateInstance should be intrinsified without UseUnalignedAccesses
  • 5bf1b9a: 8283520: JFR: Memory leak in dcmd_arena
  • c581886: 8307128: Open source some drag and drop tests 4
  • 14779b1: 8294717: (bf) DirectByteBuffer constructor will leak if allocating Deallocator or Cleaner fails with OOME
  • 57d0a7f: 8300939: sun/security/provider/certpath/OCSP/OCSPNoContentLength.java fails due to network errors
  • 436d96f: 8275287: Relax memory ordering constraints on updating instance class and array class counters
  • 50aabaa: 8307347: serviceability/sa/ClhsdbDumpclass.java could leave files owned by root on macOS

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 26, 2023

@shipilev Pushed as commit 6287df0.

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

@shipilev shipilev deleted the JDK-8286346-allocateheap-alloc-failtype branch July 20, 2023 12:02
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.

1 participant