Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

gh-116116: Backport PR #42 to fix building with clang-cl on windows-i686#116117

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
zooba merged 4 commits intopython:mainfromgeorgthegreat:clang-cl
Mar 4, 2024

Conversation

@georgthegreat
Copy link
Contributor

@georgthegreatgeorgthegreat commentedFeb 29, 2024
edited
Loading

BackportPR #42 to work around the following compilation error:

In file included from $(SOURCE_ROOT)/python3/src/Modules/_blake2/blake2b_impl.c:30:$(SOURCE_ROOT)/python3/src/Modules/_blake2/impl/blake2b.c(31,23): error: conflicting types for '_mm_set_epi64x'static inline __m128i _mm_set_epi64x( const uint64_t u1, const uint64_t u0 )                      ^$(TOOL_ROOT)/clang/14.0.6/include/emmintrin.h(3613,1): note: previous definition is here_mm_set_epi64x(long long __q1, long long __q0)^1 error generated.

@hugovkhugovk added OS-windows 3.12only security fixes 3.13bugs and security fixes and removed 3.12only security fixes 3.13bugs and security fixes labelsFeb 29, 2024
@zooba
Copy link
Member

zooba commentedFeb 29, 2024
edited
Loading

Seems fine to me. The generated files are the SBOM containing the hashes of these files.

@sethmlarson What's the way we should handle this kind of in-repo patching? Is regenerating the SBOM enough? Or do we need to track the before/after state as well? (Apologies for the incorrect tag if you see this, other-Seth)

@sethmlarson
Copy link
Contributor

@zooba I think it's fine that we make minor in-source changes, we run the risk of losing them when the dependency is updated so we should try to upstream the changes too. In a perfect world we'd be marking our SBOM with precise patches/descendants relationships, but I'm not sure how important that is for our primary use-case which is vulnerability management/discovery.

zooba and gpshead reacted with thumbs up emoji

@zooba
Copy link
Member

Okay, so this one is a backport from upstream so we won't lose it. We just need the SBOM to be regenerated to be able to merge the PR. I believe there's an open PR adding that functionality to the Windows build, so we'll probably have to wait for that to be merged before this can be updated.

@georgthegreat
Copy link
ContributorAuthor

@zooba, I have updated sbom files as requested

zooba reacted with thumbs up emoji

@georgthegreat
Copy link
ContributorAuthor

@zooba, let's merge it.

@gpsheadgpshead self-assigned thisMar 4, 2024
@gpsheadgpshead added needs backport to 3.11only security fixes needs backport to 3.12only security fixes labelsMar 4, 2024
@zoobazooba merged commit9b9e819 intopython:mainMar 4, 2024
@miss-islington-app
Copy link

Thanks@georgthegreat for the PR, and@zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull requestMar 4, 2024
… on windows-i686 (pythonGH-116117)(cherry picked from commit9b9e819)Co-authored-by: Yuriy Chernyshov <thegeorg@yandex-team.com>
@miss-islington-app
Copy link

Sorry,@georgthegreat and@zooba, I could not cleanly backport this to3.11 due to a conflict.
Please backport usingcherry_picker on command line.

cherry_picker 9b9e819b5116302cb4e471763feb2764eb17dde8 3.11

@bedevere-app
Copy link

GH-116315 is a backport of this pull request to the3.12 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.12only security fixes labelMar 4, 2024
zooba pushed a commit that referenced this pull requestMar 4, 2024
…ndows-i686 (GH-116117)(cherry picked from commit9b9e819)Co-authored-by: Yuriy Chernyshov <thegeorg@yandex-team.com>
woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull requestMar 4, 2024
@zooba
Copy link
Member

@georgthegreat Is this needed for 3.11? Could you prepare a PR for that branch? I suspect it's the SBOM conflicting, but maybe it's not needed for an older version of blake2.

@georgthegreat
Copy link
ContributorAuthor

georgthegreat commentedMar 5, 2024
edited
Loading

We do not need it in our codebase as we have switched to 3.12, so it is up to you to decide.
Do you consider this bug critical?

@georgthegreatgeorgthegreat deleted the clang-cl branchMarch 5, 2024 16:00
@zoobazooba removed the needs backport to 3.11only security fixes labelMar 5, 2024
@zooba
Copy link
Member

Do you consider this bug critical?

Nope :) But it wasn't critical to me in main either, so that's not a great bar for whether to backport. Happy to defer to your needs, and if someone else needs it for 3.11 then they can prepare a backport.

gpshead reacted with thumbs up emoji

adorilson pushed a commit to adorilson/cpython that referenced this pull requestMar 25, 2024
diegorusso pushed a commit to diegorusso/cpython that referenced this pull requestApr 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

@gpsheadgpsheadgpshead approved these changes

@tirantiranAwaiting requested review from tiran

@sethmlarsonsethmlarsonAwaiting requested review from sethmlarsonsethmlarson is a code owner

Assignees

@zoobazooba

Labels

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@georgthegreat@zooba@sethmlarson@gpshead@hugovk

[8]ページ先頭

©2009-2025 Movatter.jp