diff options
| author | bors <bors@rust-lang.org> | 2024-10-20 03:34:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-20 03:34:09 +0000 |
| commit | d68c32779627fcd72a928c9e89f65094dbcf7482 (patch) | |
| tree | f664187b0159d5a2466b5ccb27d5dde7d906c24e /compiler/rustc_codegen_llvm/src/intrinsic.rs | |
| parent | 54791efd8235805dcfbdad3b8788e08f2142c50b (diff) | |
| parent | 456821be88146f2f94be26354576794b431fd83e (diff) | |
| download | rust-d68c32779627fcd72a928c9e89f65094dbcf7482.tar.gz rust-d68c32779627fcd72a928c9e89f65094dbcf7482.zip | |
Auto merge of #131958 - Zalathar:rollup-gkuk3n1, r=Zalathar
Rollup of 4 pull requests Successful merges: - #131876 (compiler: Use LLVM's Comdat support) - #131941 (compiletest: disambiguate html-tidy from rust tidy tool) - #131942 (compiler: Adopt rust-analyzer impls for `LayoutCalculatorError`) - #131945 (rustdoc: Clean up footnote handling) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/intrinsic.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/intrinsic.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/intrinsic.rs b/compiler/rustc_codegen_llvm/src/intrinsic.rs index bfe623e7fc3..64f1d21b438 100644 --- a/compiler/rustc_codegen_llvm/src/intrinsic.rs +++ b/compiler/rustc_codegen_llvm/src/intrinsic.rs @@ -787,7 +787,9 @@ fn codegen_msvc_try<'ll>( let tydesc = bx.declare_global("__rust_panic_type_info", bx.val_ty(type_info)); unsafe { llvm::LLVMRustSetLinkage(tydesc, llvm::Linkage::LinkOnceODRLinkage); - llvm::SetUniqueComdat(bx.llmod, tydesc); + if bx.cx.tcx.sess.target.supports_comdat() { + llvm::SetUniqueComdat(bx.llmod, tydesc); + } llvm::LLVMSetInitializer(tydesc, type_info); } |