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_ssa/src | |
| 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_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index bea454458c4..540979ce02d 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -32,7 +32,7 @@ use rustc_session::Session; use rustc_span::source_map::SourceMap; use rustc_span::symbol::sym; use rustc_span::{BytePos, FileName, InnerSpan, Pos, Span}; -use rustc_target::spec::{MergeFunctions, PanicStrategy, SanitizerSet}; +use rustc_target::spec::{MergeFunctions, SanitizerSet}; use std::any::Any; use std::fs; @@ -313,7 +313,6 @@ pub struct CodegenContext<B: WriteBackendMethods> { pub backend: B, pub prof: SelfProfilerRef, pub lto: Lto, - pub no_landing_pads: bool, pub save_temps: bool, pub fewer_names: bool, pub time_trace: bool, @@ -1039,7 +1038,6 @@ fn start_executing_work<B: ExtraBackendMethods>( crate_types: sess.crate_types().to_vec(), each_linked_rlib_for_lto, lto: sess.lto(), - no_landing_pads: sess.panic_strategy() == PanicStrategy::Abort, fewer_names: sess.fewer_names(), save_temps: sess.opts.cg.save_temps, time_trace: sess.opts.debugging_opts.llvm_time_trace, |