diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-12-19 14:41:35 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 14:41:35 +0530 |
| commit | a9005b6cc0222bd8253b843fa5804e139f701826 (patch) | |
| tree | dc80787c60122ffd4957d8cafb54728a1614f3c1 /compiler/rustc_codegen_llvm/src | |
| parent | 90035f130ecc9c8550b935cc9705531122746ee7 (diff) | |
| parent | 1da4a499122f59201cf761b79f9e8c6ded1cb91d (diff) | |
| download | rust-a9005b6cc0222bd8253b843fa5804e139f701826.tar.gz rust-a9005b6cc0222bd8253b843fa5804e139f701826.zip | |
Rollup merge of #105864 - matthiaskrgr:compl, r=Nilstrieb
clippy::complexity fixes filter_next needless_question_mark bind_instead_of_map manual_find derivable_impls map_identity redundant_slicing skip_while_next unnecessary_unwrap needless_bool r? `@compiler-errors`
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/builder.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/builder.rs b/compiler/rustc_codegen_llvm/src/builder.rs index 853a8b82853..5bf45a81e43 100644 --- a/compiler/rustc_codegen_llvm/src/builder.rs +++ b/compiler/rustc_codegen_llvm/src/builder.rs @@ -233,8 +233,8 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> { // Set KCFI operand bundle let is_indirect_call = unsafe { llvm::LLVMIsAFunction(llfn).is_none() }; let kcfi_bundle = - if self.tcx.sess.is_sanitizer_kcfi_enabled() && fn_abi.is_some() && is_indirect_call { - let kcfi_typeid = kcfi_typeid_for_fnabi(self.tcx, fn_abi.unwrap()); + if self.tcx.sess.is_sanitizer_kcfi_enabled() && let Some(fn_abi) = fn_abi && is_indirect_call { + let kcfi_typeid = kcfi_typeid_for_fnabi(self.tcx, fn_abi); Some(llvm::OperandBundleDef::new("kcfi", &[self.const_u32(kcfi_typeid)])) } else { None |