Correct branch-protection ModFlagBehavior for Aarch64 on LLVM-15 #105932
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When building with Fat LTO and BTI enabled on aarch64, the BTI is set to `Module::Min` for alloc shim but is set to `Module::Error` for the crate. This was fine when we were using LLVM-14 but LLVM-15 changes it's behaviour to support for compiling with different `mbranch-protection` flags. Refer: rust-lang/llvm-project@b0343a3
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (or someone else) soon. Please see the contribution instructions for more information. |
rustbot
added
S-waiting-on-review
MasterAwesome
changed the title
This comment has been minimized.
This comment has been minimized.
|
Min is new in LLVM 15, so this will have to be dependent on version. Either need to pass in Min/Error depending on version, or possibly adjust to automatically use Error instead of Min for old versions. |
|
Ah I see, I'll do an FFI call prior to setting the modflagbehavior to get the version and choose I could add that in the cpp file but I think it might hide future hard to debug issues where the What do you think? |
|
Either way is fine by me. On the Rust side, there's already a |
CI fails when building with LLVM-13. This raises unknown behavior constant `8` from IRVerifier.
|
@bors r+ |
bors
added
S-waiting-on-bors
fee1-dead
added a commit
to fee1-dead-contrib/rust
that referenced
this pull request
Dec 21, 2022
… r=nikic Correct branch-protection ModFlagBehavior for Aarch64 on LLVM-15 When building with Fat LTO and BTI enabled on aarch64, the BTI is set to `Module::Min` for alloc shim but is set to `Module::Error` for the crate. This was fine when we were using LLVM-14 but LLVM-15 changes it's behaviour to support for compiling with different `mbranch-protection` flags. Refer: rust-lang/llvm-project@b0343a3 fixes rust-lang#102162
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 22, 2022
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#105837 (Don't ICE in `check_must_not_suspend_ty` for mismatched tuple arity) - rust-lang#105932 (Correct branch-protection ModFlagBehavior for Aarch64 on LLVM-15) - rust-lang#105960 (Various cleanups) - rust-lang#105985 (Method chain nitpicks) - rust-lang#105996 (Test that async blocks are `UnwindSafe`) - rust-lang#106012 (Clarify that raw retags are not permitted in Mir) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#105837 (Don't ICE in `check_must_not_suspend_ty` for mismatched tuple arity) - rust-lang#105932 (Correct branch-protection ModFlagBehavior for Aarch64 on LLVM-15) - rust-lang#105960 (Various cleanups) - rust-lang#105985 (Method chain nitpicks) - rust-lang#105996 (Test that async blocks are `UnwindSafe`) - rust-lang#106012 (Clarify that raw retags are not permitted in Mir) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When building with Fat LTO and BTI enabled on aarch64, the BTI is set to
Module::Minfor alloc shim but is set toModule::Errorfor the crate. This was fine when we were using LLVM-14 but LLVM-15 changes it's behaviour to support for compiling with differentmbranch-protectionflags.Refer:
rust-lang/llvm-project@b0343a3
fixes #102162