Skip to content

Commit 86b1581

Browse files
committed
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
2 parents ee5d8d3 + 68d47de commit 86b1581

File tree

42 files changed

+793
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+793
-382
lines changed

compiler/rustc_codegen_llvm/src/back/lto.rs

-17
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,6 @@ fn fat_lto(
349349
);
350350
save_temp_bitcode(cgcx, &module, "lto.after-restriction");
351351
}
352-
353-
if cgcx.no_landing_pads {
354-
unsafe {
355-
llvm::LLVMRustMarkAllFunctionsNounwind(llmod);
356-
}
357-
save_temp_bitcode(cgcx, &module, "lto.after-nounwind");
358-
}
359352
}
360353

361354
Ok(LtoModuleCodegen::Fat { module: Some(module), _serialized_bitcode: serialized_bitcode })
@@ -770,16 +763,6 @@ pub unsafe fn optimize_thin_module(
770763
return Err(write::llvm_err(&diag_handler, msg));
771764
}
772765

773-
// Like with "fat" LTO, get some better optimizations if landing pads
774-
// are disabled by removing all landing pads.
775-
if cgcx.no_landing_pads {
776-
let _timer = cgcx
777-
.prof
778-
.generic_activity_with_arg("LLVM_thin_lto_remove_landing_pads", thin_module.name());
779-
llvm::LLVMRustMarkAllFunctionsNounwind(llmod);
780-
save_temp_bitcode(cgcx, &module, "thin-lto-after-nounwind");
781-
}
782-
783766
// Up next comes the per-module local analyses that we do for Thin LTO.
784767
// Each of these functions is basically copied from the LLVM
785768
// implementation and then tailored to suit this implementation. Ideally

0 commit comments

Comments
 (0)