Navigation Menu

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

8291713: assert(!phase->exceeding_node_budget()) failed: sanity after JDK-8223389 #1335

Closed
wants to merge 2 commits into from

Conversation

rwestrel
Copy link
Contributor

@rwestrel rwestrel commented Aug 19, 2022

This fixes an issue with the backport of
https://bugs.openjdk.org/browse/JDK-8223363:

openjdk/jdk11u@5f40afc

where a line that should have been removed wasn't.


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-8291713: assert(!phase->exceeding_node_budget()) failed: sanity after JDK-8223389

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1335

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 19, 2022

👋 Welcome back roland! 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 Pull request is ready for review label Aug 19, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 19, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm.

@openjdk
Copy link

openjdk bot commented Aug 19, 2022

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

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

8291713: assert(!phase->exceeding_node_budget()) failed: sanity after JDK-8223389

Reviewed-by: phh, xliu, clanger

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:

  • 42dc282: 8283903: GetContainerCpuLoad does not return the correct result in share mode
  • 76cab61: 8279032: compiler/loopopts/TestSkeletonPredicateNegation.java times out with -XX:TieredStopAtLevel < 4
  • a491f0d: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • fa8c0d6: 8242188: error in jtreg test jdk/jfr/api/consumer/TestRecordedFrame.java on linux-aarch64
  • 501352c: 8239423: jdk/jfr/jvm/TestJFRIntrinsic.java failed with -XX:-TieredCompilation
  • a77dd69: 8239265: JFR: Test cleanup of jdk.jfr.api.consumer package
  • ad2e6e4: 8251152: ARM32: jtreg c2 Test8202414 test crash
  • 58076db: 8214078: (fs) SecureDirectoryStream not supported on arm32
  • 3db29c4: 8252145: Unify Info.plist files with correct version strings

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 the ready Pull request is ready to be integrated label Aug 19, 2022
Copy link
Member

@navyxliu navyxliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. I am not a reviewer.

Double check that the original patch did replacement here. We introduced an side-effect (+=) when we backported it. the fix is correct.

-  uint require_nodes(uint require) {
+  uint require_nodes(uint require, uint minreq = REQUIRE_MIN) {
     precond(require > 0);
-    _nodes_required += MAX2(100u, require); // Keep requests at minimum 100.
+    _nodes_required += MAX2(require, minreq);
     return _nodes_required;
   }

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

@rwestrel
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2022

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

  • 42dc282: 8283903: GetContainerCpuLoad does not return the correct result in share mode
  • 76cab61: 8279032: compiler/loopopts/TestSkeletonPredicateNegation.java times out with -XX:TieredStopAtLevel < 4
  • a491f0d: 8289569: [test] java/lang/ProcessBuilder/Basic.java fails on Alpine/musl
  • fa8c0d6: 8242188: error in jtreg test jdk/jfr/api/consumer/TestRecordedFrame.java on linux-aarch64
  • 501352c: 8239423: jdk/jfr/jvm/TestJFRIntrinsic.java failed with -XX:-TieredCompilation
  • a77dd69: 8239265: JFR: Test cleanup of jdk.jfr.api.consumer package
  • ad2e6e4: 8251152: ARM32: jtreg c2 Test8202414 test crash
  • 58076db: 8214078: (fs) SecureDirectoryStream not supported on arm32
  • 3db29c4: 8252145: Unify Info.plist files with correct version strings

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 23, 2022

@rwestrel Pushed as commit 5d344f1.

💡 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
integrated Pull request has been integrated
4 participants