diff options
| author | bors <bors@rust-lang.org> | 2022-02-18 18:49:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-18 18:49:25 +0000 |
| commit | b17226fcc11587fed612631be372a5b4cb89988a (patch) | |
| tree | f254265efe6fcda78534a586983a65940f4d6f1d /compiler/rustc_codegen_llvm/src | |
| parent | b8c56fa8c30821129b0960180f528d4a1a4f9316 (diff) | |
| parent | a144ea1c4b39bdef608c537b25343674aa2b5bc7 (diff) | |
| download | rust-b17226fcc11587fed612631be372a5b4cb89988a.tar.gz rust-b17226fcc11587fed612631be372a5b4cb89988a.zip | |
Auto merge of #94121 - matthiaskrgr:rollup-6ps95da, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #92683 (Suggest copying trait associated type bounds on lifetime error)
- #92933 (Deny mixing bin crate type with lib crate types)
- #92959 (Add more info and suggestions to use of #[test] on invalid items)
- #93024 (Do not ICE when inlining a function with un-satisfiable bounds)
- #93613 (Move `{core,std}::stream::Stream` to `{core,std}::async_iter::AsyncIterator`)
- #93634 (compiler: clippy::complexity fixes)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/context.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs index ec68f6eb0f8..90ddf791450 100644 --- a/compiler/rustc_codegen_llvm/src/context.rs +++ b/compiler/rustc_codegen_llvm/src/context.rs @@ -292,7 +292,7 @@ pub unsafe fn create_module<'ll>( "sign-return-address-all\0".as_ptr().cast(), pac_opts.leaf.into(), ); - let is_bkey = if pac_opts.key == PAuthKey::A { false } else { true }; + let is_bkey: bool = pac_opts.key != PAuthKey::A; llvm::LLVMRustAddModuleFlag( llmod, llvm::LLVMModFlagBehavior::Error, |