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

Jump to bottom

8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes #713

Closed
wants to merge 2 commits into from
Closed

8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes #713

wants to merge 2 commits into from
+7 −1

Conversation

nhat-nguyen
Copy link
Contributor

@nhat-nguyen nhat-nguyen commented Oct 16, 2020 •
edited by openjdk bot

I'm following up on this thread http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/2020-September/039910.html
I'm clearing for_igvn before restoring as suggested by Xin

Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) ✔️ (9/9 passed) ✔️ (9/9 passed)

Issue

  • JDK-8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/713/head:pull/713
$ git checkout pull/713

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 16, 2020

👋 Welcome back nhat-nguyen! 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 Oct 16, 2020
@openjdk
Copy link

openjdk bot commented Oct 16, 2020

@nhat-nguyen The following label will be automatically applied to this pull request:

  • hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Oct 16, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 16, 2020 •
edited

Webrevs

@navyxliu
Copy link
Member

Looks good to me, but we need at least a reviewer to approve it.

iwanowww
iwanowww reviewed Oct 17, 2020
View reviewed changes
src/hotspot/share/opto/compile.cpp Outdated
// Restore the original for_igvn pointer for subsequent uses.
// Clear the for_igvn list because it may have irrelevant nodes
// from the previous PhaseRenumberLive run.
save_for_igvn->clear();
Copy link

Choose a reason for hiding this comment

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

Since PhaseRenumberLive::PhaseRenumberLive moves nodes from for_igvn() to new_worklist, does it make more sense to drain original for_igvn() worklist there?

Copy link
Member

Choose a reason for hiding this comment

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

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the suggestion. I have updated the PR.

Copy link
Member

Choose a reason for hiding this comment

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

LGTM

iwanowww
iwanowww approved these changes Oct 19, 2020
View reviewed changes
Copy link

@iwanowww iwanowww left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Oct 19, 2020 •
edited

@nhat-nguyen 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:

8251271: C2: Compile::_for_igvn list is corrupted after RenumberLiveNodes

Reviewed-by: vlivanov

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 150 new commits pushed to 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@iwanowww) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 19, 2020
@nhat-nguyen
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 19, 2020
@openjdk
Copy link

openjdk bot commented Oct 19, 2020

@nhat-nguyen
Your change (at version 35835f8) is now ready to be sponsored by a Committer.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk openjdk bot closed this Oct 20, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 20, 2020
@openjdk
Copy link

openjdk bot commented Oct 20, 2020

@TobiHartmann @nhat-nguyen Since your change was applied there have been 159 commits pushed to the master branch:

  • 98ec4a6: 8254805: compiler/debug/TestStressCM.java is still failing
  • 355f44d: 8254994: [x86] C1 StubAssembler::call_RT, "call_offset might not be initialized"
  • 0a75b37: 8254776: Remove unimplemented LowMemoryDetector::check_memory_usage
  • b65dcfa: 8197981: Missing return statement in __sync_val_compare_and_swap_8
  • 5b51085: 8254997: Remove unimplemented OSContainer::read_memory_limit_in_bytes
  • c87cdf7: 8254029: ObjectMonitor cleanup/minor bug-fix changes extracted from JDK-8253064
  • 7a580ca: 8255027: Problem list for Graal test gc/stress/TestStressG1Humongous.java
  • 6e8835c: 7110890: reg test TranslucentShapedFrameTest fails to create non-opaque frame
  • bf19581: 8255016: ConstantDescs.FALSE claims it represents TRUE
  • 0f4fb36: 8255032: Conflict between recent pushes breaks the build
  • ... and 149 more: https://git.openjdk.java.net/jdk/compare/c2a5de636fe44637f84fae76a8bb42524a7b2885...master

Your commit was automatically rebased without conflicts.

Pushed as commit 5fedfa7.

💡 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
Reviewers

@navyxliu navyxliu navyxliu left review comments

@iwanowww iwanowww iwanowww approved these changes

@TobiHartmann TobiHartmann TobiHartmann approved these changes

Assignees
No one assigned
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
4 participants
@nhat-nguyen @navyxliu @TobiHartmann @iwanowww