8000 Remove nested comments in blake2 by zao · Pull Request #4173 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

Remove nested comments in blake2 #4173

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

Merged
merged 1 commit into from
Nov 1, 2017
Merged

Remove nested comments in blake2 #4173

merged 1 commit into from
Nov 1, 2017

Conversation

zao
Copy link
Contributor
@zao zao commented Oct 30, 2017

Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.

blake2s-load-xop.h is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of hashlib's _blake2 on GCC 6.3.0.

Official reference code on github uses #if so this change should be
uncontroversial.

Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.

`blake2s-load-xop.h` is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0.

Official reference code on github uses `#if` so this change should be
uncontroversial.
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately our records indicate you have not signed the CLA. For legal reasons we need you to sign this before we can look at your contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

Thanks again to your contribution and we look forward to looking at it!

@zao
Copy link
Contributor Author
zao commented Oct 30, 2017

Signed CLA earlier today so that's in the pipeline if that's needed for this kind of custodial change.
Didn't open any issue as it's a trivial fix, compiles successfully on an affected system.

@Mariatta Mariatta requested a review from tiran October 30, 2017 16:58
@zao
Copy link
Contributor Author
zao commented Oct 31, 2017

tiran
8000 tiran approved these changes Nov 1, 2017
Copy link
Member
@tiran tiran left a comment

Choose a reason for hiding this comment

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

OK, the fix is also present in BLAKE2 upstream.

@miss-islington
Copy link
Contributor

Thanks @zao for the PR, and @tiran for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 1, 2017
Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.

`blake2s-load-xop.h` is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0.

Official reference code on github uses `GH-if` so this change should be
uncontroversial.
(cherry picked from commit 388cd85)
@bedevere-bot
Copy link

GH-4214 is a backport of this pull request to the 3.6 branch.

tiran pushed a commit that referenced this pull request Nov 1, 2017
Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.

`blake2s-load-xop.h` is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0.

Official reference code on github uses `GH-if` so this change should be
uncontroversial.
(cherry picked from commit 388cd85)
embray pushed a commit to embray/cpython that referenced this pull request Nov 9, 2017
Replace occurence of nested comments in blake2 reference implementation
with preprocessor directive for disabling unused code.

`blake2s-load-xop.h` is conditionally pulled in only on chips with XOP
support, among others the AMD Bulldozer. The malformed comments in the
source file breaks the build of `hashlib`'s `_blake2` on GCC 6.3.0.

Official reference code on github uses `#if` so this change should be
uncontroversial.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants
0