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

8274325: C4819 warning at vm_version_x86.cpp on Windows after JDK-8234160 #5701

Closed
wants to merge 2 commits into from

Conversation

DamonFool
Copy link
Member

@DamonFool DamonFool commented Sep 26, 2021

Hi all,

I'd like to fix the C4819 warning at vm_version_x86.cpp on Windows after JDK-8234160.

The reason is that there are non-ASCII chars in the comments of vm_version_x86.cpp after JDK-8234160.
It makes the code to be less portable.

It would be better to fix it.

The fix just removing those chars in the comments.

Thanks.
Best regards,
Jie


Progress

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

Issue

  • JDK-8274325: C4819 warning at vm_version_x86.cpp on Windows after JDK-8234160

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5701

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 26, 2021

👋 Welcome back jiefu! 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 Sep 26, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 26, 2021

@DamonFool 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 hotspot-dev@openjdk.org label Sep 26, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 26, 2021

Webrevs

@dholmes-ora
Copy link
Member

@dholmes-ora dholmes-ora commented Sep 27, 2021

I suggest replacing with ascii equivalents: Intel(R) Core(TM)

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Sep 27, 2021

I suggest replacing with ascii equivalents: Intel(R) Core(TM)

Updated.
Thanks @dholmes-ora .

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Looks good and trivial.

Thanks,
David

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

8274325: C4819 warning at vm_version_x86.cpp on Windows after JDK-8234160

Reviewed-by: dholmes

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:

  • e3aff8f: 8274289: jdk/jfr/api/consumer/TestRecordedFrameType.java failed with "RuntimeException: assertNotEquals: expected Interpreted to not equal Interpreted"
  • 252aaa9: 8274293: Build failure on macOS with Xcode 13.0 as vfork is deprecated
  • 7700b25: 8273401: Disable JarIndex support in URLClassPath

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 Sep 27, 2021
@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Sep 27, 2021

Looks good and trivial.

Thanks,
David

Thanks @dholmes-ora .
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

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

  • e3aff8f: 8274289: jdk/jfr/api/consumer/TestRecordedFrameType.java failed with "RuntimeException: assertNotEquals: expected Interpreted to not equal Interpreted"
  • 252aaa9: 8274293: Build failure on macOS with Xcode 13.0 as vfork is deprecated
  • 7700b25: 8273401: Disable JarIndex support in URLClassPath

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 27, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 27, 2021

@DamonFool Pushed as commit 7426fd4.

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

@DamonFool DamonFool deleted the JDK-8274325 branch Sep 27, 2021
@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 9, 2021

/backport jdk17u

@openjdk
Copy link

@openjdk openjdk bot commented Oct 9, 2021

@DamonFool Unknown command backport - for a list of valid commands use /help.

@DamonFool
Copy link
Member Author

@DamonFool DamonFool commented Oct 9, 2021

/help

@openjdk
Copy link

@openjdk openjdk bot commented Oct 9, 2021

@DamonFool Available commands:

  • covered - used when employer has signed the OCA
  • help - shows this text
  • signed - used after signing the OCA
  • test - used to run tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
2 participants