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

Bump compiler-builtins to 0.1.69 #93696

Merged
merged 1 commit into from
Feb 13, 2022

Conversation

Amanieu
Copy link
Member

@Amanieu Amanieu commented Feb 6, 2022

This includes rust-lang/compiler-builtins#452 which should fix some issues with duplicate symbol defintions of some intrinsics.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 6, 2022
@Amanieu
Copy link
Member Author

Amanieu commented Feb 6, 2022

@bors rollup=iffy

@Mark-Simulacrum
Copy link
Member

Can you update this comment - https://github.com/rust-lang/rust/blob/master/Cargo.toml#L68

I'm worried that it seems like the comment suggests separate modules shouldn't be necessary, but maybe I am missing something.

@Amanieu
Copy link
Member Author

Amanieu commented Feb 6, 2022

This comment still applies, it's just that codegen unit splitting only works at module boundaries so each function needs to be wrapped in its own mod. This was already the case for most intrinsics but there were a few that weren't wrapped which were causing errors.

@Mark-Simulacrum
Copy link
Member

That makes sense to me. It may be worth adding a flag to rustc which partitions without the module boundary grouping, FWIW, but seems like this solution works OK for now.

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 6, 2022

📌 Commit 59b2ee564093747c0b4de8036942fa8145750504 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 6, 2022
@bors
Copy link
Contributor

bors commented Feb 7, 2022

⌛ Testing commit 59b2ee564093747c0b4de8036942fa8145750504 with merge 18f60772bab1f08de99ceb7409fc0f20c29a5d50...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Feb 7, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 7, 2022
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 7, 2022
@Amanieu Amanieu force-pushed the compiler-builtins-0.1.68 branch from 59b2ee5 to 7b8f6ac Compare February 9, 2022 21:03
@Amanieu Amanieu changed the title Bump compiler-builtins to 0.1.68 Bump compiler-builtins to 0.1.69 Feb 9, 2022
@Amanieu
Copy link
Member Author

Amanieu commented Feb 9, 2022

There was a typo in the inline assembly which caused the wrong function to be called. This is fixed in compiler-builtins 0.1.69.

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 9, 2022

📌 Commit 7b8f6ac has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 9, 2022
@bors
Copy link
Contributor

bors commented Feb 13, 2022

⌛ Testing commit 7b8f6ac with merge 01c4c41...

@bors
Copy link
Contributor

bors commented Feb 13, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 01c4c41 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 13, 2022
@bors bors merged commit 01c4c41 into rust-lang:master Feb 13, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 13, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (01c4c41): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants