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

8266438: Compile::remove_useless_nodes does not remove opaque nodes #3840

Closed
wants to merge 1 commit into from

Conversation

TobiHartmann
Copy link
Member

@TobiHartmann TobiHartmann commented May 3, 2021

JDK-8255026 refactored the code in Compile::remove_useless_nodes and as a result, useless nodes are no longer removed from the _predicate_opaqs list. Before the change, the call to remove_macro_node took care of this:

void remove_macro_node(Node* n) {
// this function may be called twice for a node so we can only remove it
// if it's still existing.
_macro_nodes.remove_if_existing(n);
// remove from _predicate_opaqs list also if it is there
if (predicate_count() > 0) {
_predicate_opaqs.remove_if_existing(n);
}
}

But the new code only removes nodes from the _macro_nodes list. Useless nodes should be removed from the _skeleton_predicate_opaqs list as well.

I've seen failures due to this with a change in Valhalla (where we call remove_useless_nodes more often) but not in mainline. I think this should still be fixed in mainline.

Thanks,
Tobias


Progress

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

Issue

  • JDK-8266438: Compile::remove_useless_nodes does not remove opaque nodes

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3840/head:pull/3840
$ git checkout pull/3840

Update a local copy of the PR:
$ git checkout pull/3840
$ git pull https://git.openjdk.java.net/jdk pull/3840/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3840

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3840.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 3, 2021

👋 Welcome back thartmann! 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 May 3, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 3, 2021

@TobiHartmann 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 label May 3, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 3, 2021

Webrevs

Copy link

@iwanowww iwanowww left a comment

Looks good.

@openjdk
Copy link

@openjdk openjdk bot commented May 3, 2021

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

8266438: Compile::remove_useless_nodes does not remove opaque nodes

Reviewed-by: vlivanov, chagedorn

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

  • 880c138: 8265349: vmTestbase/../stress/compiler/deoptimize/Test.java fails with OOME due to CodeCache exhaustion.
  • 001c514: 8265322: C2: Simplify control inputs for BarrierSetC2::obj_allocate
  • 194bcec: 8265984: Concurrent GC: Some tests fail "assert(is_frame_safe(f)) failed: Frame must be safe"
  • 1d9ea3a: 8266083: Shenandoah: Consolidate dedup/no dedup oop closures
  • 80941f4: 8234446: Post-CMS workgroup hierarchy cleanup
  • ac760c7: 8266295: Remove unused _concurrent_iteration_safe_limit
  • b42d496: 8266388: C2: Improve constant ShiftCntV on x86
  • 05cfac9: 8266412: Remove redundant TemplateInterpreter entries

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 label May 3, 2021
@TobiHartmann
Copy link
Member Author

@TobiHartmann TobiHartmann commented May 3, 2021

Thanks for the review, Vladimir!

Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good!

@TobiHartmann
Copy link
Member Author

@TobiHartmann TobiHartmann commented May 4, 2021

Thanks for the review, Christian!

@TobiHartmann
Copy link
Member Author

@TobiHartmann TobiHartmann commented May 4, 2021

/integrate

@openjdk openjdk bot closed this May 4, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 4, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 4, 2021

@TobiHartmann Since your change was applied there have been 18 commits pushed to the master branch:

  • 141cc2f: 8261527: Record page size used for underlying mapping in ReservedSpace
  • 8e071c4: 8265784: [C2] Hoisting of DecodeN leaves MachTemp inputs behind
  • ce1bc9d: 8266432: ZGC: GC allocation stalls can trigger deadlocks
  • 30ccd80: 8264950: Set opaque for JTooltip in config file of NimbusLookAndFeel
  • cfdf4a7: 8266449: cleanup jtreg tags in compiler/intrinsics/sha/cli tests
  • 3544a9d: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 020236c: 8264786: [macos] All Swing/AWT apps cause Allow Notifications prompt to appear when app is launched
  • 45760d4: 8266320: (bf) ReadOnlyBufferException in heap buffer put(String,int,int) should not be conditional
  • ff65920: 8265491: Math Signum optimization for x86
  • 55cc0af: 8266185: Shenandoah: Fix incorrect comment/assertion messages
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/c5dc657f0be90bd594663dcc612f40a930c2bbe7...master

Your commit was automatically rebased without conflicts.

Pushed as commit b651904.

💡 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
hotspot-compiler integrated
3 participants