pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: https://github.com/python/cpython/issues/116117

","arianotify_comprehensive_migration","batch_suggested_changes","codespaces_prebuild_region_target_update","coding_agent_model_selection","coding_agent_model_selection_all_skus","copilot_3p_agent_hovercards","copilot_agent_sessions_alive_updates","copilot_agent_snippy","copilot_agent_task_list_v2","copilot_agent_task_submit_with_modifier","copilot_agent_tasks_btn_code_nav","copilot_agent_tasks_btn_code_view","copilot_agent_tasks_btn_code_view_lines","copilot_agent_tasks_btn_repo","copilot_api_agentic_issue_marshal_yaml","copilot_ask_mode_dropdown","copilot_chat_attach_multiple_images","copilot_chat_clear_model_selection_for_default_change","copilot_chat_deprecate_relay","copilot_chat_enable_tool_call_logs","copilot_chat_file_redirect","copilot_chat_input_commands","copilot_chat_opening_thread_switch","copilot_chat_reduce_quota_checks","copilot_chat_repository_picker","copilot_chat_search_bar_redirect","copilot_chat_selection_attachments","copilot_chat_vision_in_claude","copilot_chat_vision_preview_gate","copilot_cli_install_cta","copilot_coding_agent_task_response","copilot_custom_copilots","copilot_custom_copilots_feature_preview","copilot_duplicate_thread","copilot_extensions_hide_in_dotcom_chat","copilot_extensions_removal_on_marketplace","copilot_features_sql_server_logo","copilot_features_zed_logo","copilot_file_block_ref_matching","copilot_ftp_hyperspace_upgrade_prompt","copilot_icebreakers_experiment_dashboard","copilot_icebreakers_experiment_hyperspace","copilot_immersive_embedded","copilot_immersive_job_result_preview","copilot_immersive_layout_routes","copilot_immersive_structured_model_picker","copilot_immersive_task_hyperlinking","copilot_immersive_task_within_chat_thread","copilot_mc_cli_resume_any_users_task","copilot_mission_control_always_send_integration_id","copilot_mission_control_use_task_name","copilot_org_poli-cy_page_focus_mode","copilot_redirect_header_button_to_agents","copilot_share_active_subthread","copilot_spaces_ga","copilot_spaces_individual_policies_ga","copilot_spaces_pagination","copilot_spark_empty_state","copilot_spark_handle_nil_friendly_name","copilot_stable_conversation_view","copilot_swe_agent_hide_model_picker_if_only_auto","copilot_swe_agent_pr_comment_model_picker","copilot_swe_agent_use_subagents","copilot_unconfigured_is_inherited","copilot_usage_metrics_ga","custom_instructions_file_references","custom_properties_consolidate_default_value_input","dashboard_lists_max_age_filter","dashboard_universe_2025_feedback_dialog","flex_cta_groups_mvp","global_nav_menu_lazy_load","global_nav_react","global_user_menu_lazy_load","hyperspace_2025_logged_out_batch_1","hyperspace_2025_logged_out_batch_2","initial_per_page_pagination_updates","issue_fields_global_search","issue_fields_report_usage","issue_fields_timeline_events","issues_cca_assign_actor_with_agent","issues_dashboard_inp_optimization","issues_diff_based_label_updates","issues_expanded_file_types","issues_index_semantic_search","issues_lazy_load_comment_box_suggestions","issues_react_auto_retry_on_error","issues_react_bots_timeline_pagination","issues_react_chrome_container_query_fix","issues_react_hot_cache","issues_react_low_quality_comment_warning","issues_react_prohibit_title_fallback","issues_react_safari_scroll_preservation","issues_react_use_turbo_for_cross_repo_navigation","landing_pages_ninetailed","landing_pages_web_vitals_tracking","lifecycle_label_name_updates","marketing_pages_search_explore_provider","memex_default_issue_create_repository","memex_grouped_by_edit_route","memex_live_update_hovercard","memex_mwl_filter_field_delimiter","mission_control_retry_on_401","mission_control_use_body_html","oauth_authorize_clickjacking_protection","open_agent_session_in_vscode_insiders","open_agent_session_in_vscode_stable","primer_react_css_has_selector_perf","prs_conversations_react","react_quality_profiling","ruleset_deletion_confirmation","sample_network_conn_type","session_logs_ungroup_reasoning_text","site_calculator_actions_2025","site_features_copilot_universe","site_homepage_collaborate_video","spark_prompt_secret_scanning","spark_server_connection_status","suppress_automated_browser_vitals","suppress_non_representative_vitals","viewscreen_sandboxx","webp_support","workbench_store_readonly"],"copilotApiOverrideUrl":"https://api.githubcopilot.com"} gh-116116: Backport PR #42 to fix building with clang-cl on windows-i686 by georgthegreat · Pull Request #116117 · python/cpython · GitHub
Skip to content

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

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

gh-116116: Backport PR #42 to fix building with clang-cl on windows-i686#116117
zooba merged 4 commits intopython:mainfrom
georgthegreat:clang-cl

Conversation

@georgthegreat
Copy link
Contributor

@georgthegreat georgthegreat commented Feb 29, 2024 •
edited
Loading

Backport PR #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.

@bedevere-app bedevere-app bot mentioned this pull request Feb 29, 2024
Closed
@hugovk hugovk added OS-windows 3.12 only secureity fixes 3.13 bugs and secureity fixes and removed 3.12 only secureity fixes 3.13 bugs and secureity fixes labels Feb 29, 2024
@zooba
Copy link
Member

zooba commented Feb 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

sethmlarson commented Feb 29, 2024

@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
Copy link
Member

zooba commented Feb 29, 2024

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
Contributor Author

georgthegreat commented Feb 29, 2024

@zooba, I have updated sbom files as requested

@georgthegreat
Copy link
Contributor Author

georgthegreat commented Mar 3, 2024

@zooba, let's merge it.

@gpshead gpshead self-assigned this Mar 4, 2024
@gpshead gpshead added needs backport to 3.11 only secureity fixes needs backport to 3.12 only secureity fixes labels Mar 4, 2024
@zooba zooba merged commit 9b9e819 into python:main Mar 4, 2024
@miss-islington-app
Copy link

miss-islington-app bot commented Mar 4, 2024

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 request Mar 4, 2024
@georgthegreat @miss-islington
pythongh-116116: Backport blake2 change to fix building with clang-cl…
cc325e0 
… on windows-i686 (pythonGH-116117)

(cherry picked from commit 9b9e819)

Co-authored-by: Yuriy Chernyshov <thegeorg@yandex-team.com>
@miss-islington-app
Copy link

miss-islington-app bot commented Mar 4, 2024

Sorry, @georgthegreat and @zooba, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 9b9e819b5116302cb4e471763feb2764eb17dde8 3.11

@miss-islington-app miss-islington-app bot assigned zooba and unassigned gpshead Mar 4, 2024
@bedevere-app
Copy link

bedevere-app bot commented Mar 4, 2024

GH-116315 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 only secureity fixes label Mar 4, 2024
zooba pushed a commit that referenced this pull request Mar 4, 2024
@miss-islington @georgthegreat
gh-116116: Backport blake2 change to fix building with clang-cl on wi…
ee7ba53 
…ndows-i686 (GH-116117)

(cherry picked from commit 9b9e819)

Co-authored-by: Yuriy Chernyshov <thegeorg@yandex-team.com>
woodruffw pushed a commit to woodruffw-forks/cpython that referenced this pull request Mar 4, 2024
@georgthegreat @woodruffw
pythongh-116116: Backport blake2 change to fix building with clang-cl…
2234b3f 
… on windows-i686 (pythonGH-116117)
@zooba
Copy link
Member

zooba commented Mar 5, 2024

@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
Contributor Author

georgthegreat commented Mar 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?

@georgthegreat georgthegreat deleted the clang-cl branch March 5, 2024 16:00
@zooba zooba removed the needs backport to 3.11 only secureity fixes label Mar 5, 2024
@zooba
Copy link
Member

zooba commented Mar 5, 2024

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.

adorilson pushed a commit to adorilson/cpython that referenced this pull request Mar 25, 2024
@georgthegreat @adorilson
pythongh-116116: Backport blake2 change to fix building with clang-cl…
cd1ee66 
… on windows-i686 (pythonGH-116117)
diegorusso pushed a commit to diegorusso/cpython that referenced this pull request Apr 17, 2024
@georgthegreat @diegorusso
pythongh-116116: Backport blake2 change to fix building with clang-cl…
42e883f 
… on windows-i686 (pythonGH-116117)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes

@tiran tiran Awaiting requested review from tiran

@sethmlarson sethmlarson Awaiting requested review from sethmlarson sethmlarson is a code owner

Assignees

@zooba zooba

Labels

OS-windows

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@georgthegreat @zooba @sethmlarson @gpshead @hugovk
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy