diff options
| author | bors <bors@rust-lang.org> | 2022-01-17 23:01:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-17 23:01:35 +0000 |
| commit | 86b1581ea0e0e47196e1ea70b2d980b3eee72623 (patch) | |
| tree | 8a54ed3035f97f62f60564089a2ba1bfecc32f0b /compiler/rustc_codegen_llvm/src/back | |
| parent | ee5d8d37baaf5b5a81a98396952839c73ae41c68 (diff) | |
| parent | 68d47def017ff062270fd553bb4c7f8fbcc672c0 (diff) | |
| download | rust-86b1581ea0e0e47196e1ea70b2d980b3eee72623.tar.gz rust-86b1581ea0e0e47196e1ea70b2d980b3eee72623.zip | |
Auto merge of #93009 - matthiaskrgr:rollup-3fkxg6i, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- #90498 (Clarifications in the target tier policy)
- #92164 (Implement `#[rustc_must_implement_one_of]` attribute)
- #92729 (rustc_codegen_llvm: Remove (almost) unused span parameter from many functions in metadata.rs)
- #92752 (Correct minor typos in some long error code explanations)
- #92801 (Enable wrapping words by default)
- #92825 (Rename environment variable for overriding rustc version)
- #92877 (Remove LLVMRustMarkAllFunctionsNounwind)
- #92936 (rustdoc: Remove `collect` in `html::markdown::parse`)
- #92956 (Add `log2` and `log10` to `NonZeroU*`)
- #92960 (Use `carrying_{mul|add}` in `num::bignum`)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/back')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/lto.rs | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/lto.rs b/compiler/rustc_codegen_llvm/src/back/lto.rs index ddba43cd1f1..6afa649b6de 100644 --- a/compiler/rustc_codegen_llvm/src/back/lto.rs +++ b/compiler/rustc_codegen_llvm/src/back/lto.rs @@ -349,13 +349,6 @@ fn fat_lto( ); save_temp_bitcode(cgcx, &module, "lto.after-restriction"); } - - if cgcx.no_landing_pads { - unsafe { - llvm::LLVMRustMarkAllFunctionsNounwind(llmod); - } - save_temp_bitcode(cgcx, &module, "lto.after-nounwind"); - } } Ok(LtoModuleCodegen::Fat { module: Some(module), _serialized_bitcode: serialized_bitcode }) @@ -770,16 +763,6 @@ pub unsafe fn optimize_thin_module( return Err(write::llvm_err(&diag_handler, msg)); } - // Like with "fat" LTO, get some better optimizations if landing pads - // are disabled by removing all landing pads. - if cgcx.no_landing_pads { - let _timer = cgcx - .prof - .generic_activity_with_arg("LLVM_thin_lto_remove_landing_pads", thin_module.name()); - llvm::LLVMRustMarkAllFunctionsNounwind(llmod); - save_temp_bitcode(cgcx, &module, "thin-lto-after-nounwind"); - } - // Up next comes the per-module local analyses that we do for Thin LTO. // Each of these functions is basically copied from the LLVM // implementation and then tailored to suit this implementation. Ideally |
