Skip to content
This repository has been archived by the owner. It is now read-only.

8269768: JFR Terminology Refresh #197

Closed
wants to merge 2 commits into from
Closed

Conversation

@vidmik
Copy link
Contributor

@vidmik vidmik commented Jul 1, 2021

In the JFR code, replace archaic/non-inclusive words with more neutral terms.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 197

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 1, 2021

👋 Welcome back mikael! 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.

Loading

@openjdk openjdk bot added the rfr label Jul 1, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

@vidmik The following label will be automatically applied to this pull request:

  • hotspot-jfr

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.

Loading

@openjdk openjdk bot added the hotspot-jfr label Jul 1, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 1, 2021

Webrevs

Loading

Good point!

Co-authored-by: Igor Ignatev <igor.v.ignatiev@gmail.com>
@openjdk
Copy link

@openjdk openjdk bot commented Jul 1, 2021

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

8269768: JFR Terminology Refresh

Reviewed-by: iignatyev, egahlin

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

  • 2db9005: 8262017: C2: assert(n != __null) failed: Bad immediate dominator info.
  • 7bc96db: 8269771: assert(tmp == _callprojs.fallthrough_catchproj) failed: allocation control projection
  • 5644c4f: 8265132: C2 compilation fails with assert "missing precedence edge"

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.

Loading

@openjdk openjdk bot added the ready label Jul 1, 2021
egahlin
egahlin approved these changes Jul 2, 2021
@vidmik
Copy link
Contributor Author

@vidmik vidmik commented Jul 2, 2021

/integrate

Loading

@openjdk
Copy link

@openjdk openjdk bot commented Jul 2, 2021

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

  • 6f0e8e7: 8269775: compiler/codegen/ClearArrayTest.java failed with "assert(false) failed: bad AD file"
  • c4ea13e: 8269543: The warning for System::setSecurityManager should only appear once for each caller
  • 2db9005: 8262017: C2: assert(n != __null) failed: Bad immediate dominator info.
  • 7bc96db: 8269771: assert(tmp == _callprojs.fallthrough_catchproj) failed: allocation control projection
  • 5644c4f: 8265132: C2 compilation fails with assert "missing precedence edge"

Your commit was automatically rebased without conflicts.

Loading

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

@openjdk openjdk bot commented Jul 2, 2021

@vidmik Pushed as commit 1c18f91.

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

Loading

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
3 participants