bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use Error behavior for LLVM versions prior to 15

Browse source 
CI fails when building with LLVM-13. This raises unknown behavior
constant `8` from IRVerifier.
This commit is contained in:
Arvind Mukund 2022-12-20 11:44:12 -08:00
parent 55c4164fff
commit 5480ac540c
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_codegen_llvm/src/context.rs
View file

@ -280,29 +280,35 @@ pub unsafe fn create_module<'ll>(
} }
if let Some(BranchProtection { bti, pac_ret }) = sess.opts.unstable_opts.branch_protection { if let Some(BranchProtection { bti, pac_ret }) = sess.opts.unstable_opts.branch_protection {
let behavior = if llvm_version >= (15, 0, 0) {
llvm::LLVMModFlagBehavior::Min
} else {
llvm::LLVMModFlagBehavior::Error
};
if sess.target.arch == "aarch64" { if sess.target.arch == "aarch64" {
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Min, behavior,
"branch-target-enforcement\0".as_ptr().cast(), "branch-target-enforcement\0".as_ptr().cast(),
bti.into(), bti.into(),
); );
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Min, behavior,
"sign-return-address\0".as_ptr().cast(), "sign-return-address\0".as_ptr().cast(),
pac_ret.is_some().into(), pac_ret.is_some().into(),
); );
let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A }); let pac_opts = pac_ret.unwrap_or(PacRet { leaf: false, key: PAuthKey::A });
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Min, behavior,
"sign-return-address-all\0".as_ptr().cast(), "sign-return-address-all\0".as_ptr().cast(),
pac_opts.leaf.into(), pac_opts.leaf.into(),
); );
llvm::LLVMRustAddModuleFlag( llvm::LLVMRustAddModuleFlag(
llmod, llmod,
llvm::LLVMModFlagBehavior::Min, behavior,
"sign-return-address-with-bkey\0".as_ptr().cast(), "sign-return-address-with-bkey\0".as_ptr().cast(),
u32::from(pac_opts.key == PAuthKey::B), u32::from(pac_opts.key == PAuthKey::B),
); );