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.

Sign up for GitHub

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

Jump to bottom

Remove workaround for the forward progress handling in LLVM #90900

Merged
merged 1 commit into from
Nov 17, 2021
Merged

Remove workaround for the forward progress handling in LLVM #90900

merged 1 commit into from
Nov 17, 2021

Conversation

andjo403
Copy link
Contributor

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in #90175

@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_gcc

cc @antoyo

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(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 Nov 14, 2021
antoyo
antoyo approved these changes Nov 14, 2021
View reviewed changes
Copy link
Contributor

@antoyo antoyo left a comment

Choose a reason for hiding this comment

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

The gcc part looks good to me.

@nikic
Copy link
Contributor

nikic commented Nov 14, 2021

Also drop

rust/compiler/rustc_codegen_llvm/src/context.rs

Line 600 in d32993a

ifn!("llvm.sideeffect", fn() -> void);
?

@andjo403
Copy link
Contributor Author

fixed the comment

@nikic
Copy link
Contributor

nikic commented Nov 14, 2021

@bors r+

@bors
Copy link
Contributor

bors commented Nov 14, 2021

📌 Commit 50ec47a has been approved by nikic

@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 Nov 14, 2021
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Nov 15, 2021
@workingjubilee
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
393176b 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@workingjubilee workingjubilee mentioned this pull request Nov 15, 2021
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Nov 15, 2021
@workingjubilee
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
3933d52 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@workingjubilee workingjubilee mentioned this pull request Nov 15, 2021
Closed
@davidtwco davidtwco assigned nikic and unassigned davidtwco Nov 15, 2021
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 15, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
098cb2a 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 15, 2021
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
e92e861 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 16, 2021
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
2b75b61 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 16, 2021
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
f612d0b 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 16, 2021
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 16, 2021
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 16, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
0d7697a 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 17, 2021
@matthiaskrgr
Rollup merge of rust-lang#90900 - andjo403:removeLlvm12Check, r=nikic
e27588a 
Remove workaround for the forward progress handling in LLVM

this workaround was only needed for LLVM < 12 and the minimum LLVM version was updated to 12 in rust-lang#90175
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 17, 2021
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 17, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 17, 2021
@bors
Auto merge of rust-lang#90984 - matthiaskrgr:rollup-j5bs96a, r=matthi…
c9c4b5d 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#89610 (warn on must_use use on async fn's)
 - rust-lang#90667 (Improve diagnostics when a static lifetime is expected)
 - rust-lang#90687 (Permit const panics in stable const contexts in stdlib)
 - rust-lang#90772 (Add Vec::retain_mut)
 - rust-lang#90861 (Print escaped string if char literal has multiple characters, but only one printable character)
 - rust-lang#90884 (Fix span for non-satisfied trivial trait bounds)
 - rust-lang#90900 (Remove workaround for the forward progress handling in LLVM)
 - rust-lang#90901 (Improve ManuallyDrop suggestion)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb660de into rust-lang:master Nov 17, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 17, 2021
@andjo403 andjo403 deleted the removeLlvm12Check branch November 17, 2021 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoyo antoyo antoyo approved these changes

Assignees

@nikic nikic

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.58.0
Development

Successfully merging this pull request may close these issues.
7 participants
@andjo403 @rust-highfive @nikic @bors @antoyo @davidtwco @rustbot