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

JDK-8276588: Change "ccc" to "CSR" in HotSpot sources #6240

Closed
wants to merge 1 commit into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Nov 3, 2021

I noticed an out-of-date use of "ccc" in the HotSpot sources and grepped over the sources to find and fix all such instances.


Progress

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

Issue

  • JDK-8276588: Change "ccc" to "CSR" in HotSpot sources

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6240

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 3, 2021

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

@openjdk openjdk bot commented Nov 3, 2021

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

  • hotspot

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

@mlbridge mlbridge bot commented Nov 3, 2021

Webrevs

Copy link
Member

@dcubed-ojdk dcubed-ojdk left a comment

Thumbs up.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 3, 2021

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

8276588: Change "ccc" to "CSR" in HotSpot sources

Reviewed-by: dcubed, kbarrett

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:

  • 32895ac: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • c7f070f: 8276208: vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java fails with "AssertionError: Unexpected output"
  • 684edbb: 8273922: (fs) UserDefinedFileAttributeView doesn't handle file names that are just under the MAX_PATH limit (win)

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 Nov 3, 2021
@@ -728,7 +728,7 @@ oop InstanceKlass::protection_domain() const {
return java_lang_Class::protection_domain(java_mirror());
}

// To remove these from requires an incompatible change and CCC request.
// To remove these from requires an incompatible change and CSR review.

Choose a reason for hiding this comment

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

I don't know what this comment is trying to say; I think there might be missing words or something. But the change for CCC -> CSR is fine.

Copy link
Member

@dholmes-ora dholmes-ora Nov 4, 2021

Choose a reason for hiding this comment

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

Given the 'R' in CSR already stands for Review this should have said "CSR request".

But I also have no idea what the comment is actually trying to say - what is "these" referring to???

Copy link
Contributor

@AlanBateman AlanBateman Nov 4, 2021

Choose a reason for hiding this comment

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

I don't know why that comment is there. The API is Class::getSigners and any changes to its behavior would require a CSR, but we are free to change the implementation. So maybe the comment should be removed.

Copy link
Member Author

@jddarcy jddarcy Nov 9, 2021

Choose a reason for hiding this comment

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

Filed JDK-8276889 in case further cleanup of the wording in instanceKlass.cpp is desired.

Copy link
Contributor

@coleenp coleenp Nov 9, 2021

Choose a reason for hiding this comment

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

Oh at one point we were trying to figure out a different way of implementing signers so that it didn't have to store a field per InstanceKlass, when we were working on density.

@jddarcy
Copy link
Member Author

@jddarcy jddarcy commented Nov 3, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 3, 2021

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

  • 32895ac: 8275650: Problemlist java/io/File/createTempFile/SpecialTempFile.java for Windows 11
  • c7f070f: 8276208: vmTestbase/nsk/jdb/repeat/repeat001/repeat001.java fails with "AssertionError: Unexpected output"
  • 684edbb: 8273922: (fs) UserDefinedFileAttributeView doesn't handle file names that are just under the MAX_PATH limit (win)

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 3, 2021

@jddarcy Pushed as commit f3320d2.

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

@jddarcy jddarcy deleted the JDK-8276588 branch Dec 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot integrated
6 participants