diff options
| author | bors <bors@rust-lang.org> | 2024-09-10 07:26:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-10 07:26:27 +0000 |
| commit | 26b2b8d162ff6cc399c7e8005230beea7eb12037 (patch) | |
| tree | 3b5e6dcbec142b7769def9f6722c7045214574c8 /compiler/rustc_codegen_ssa/src | |
| parent | 304b7f801bab31233680879ca4fb6eb294706a59 (diff) | |
| parent | 9749a9801c5d5b5c17abcce81cf78c5010e60d1b (diff) | |
| download | rust-26b2b8d162ff6cc399c7e8005230beea7eb12037.tar.gz rust-26b2b8d162ff6cc399c7e8005230beea7eb12037.zip | |
Auto merge of #130179 - workingjubilee:rollup-l78cv44, r=workingjubilee
Rollup of 11 pull requests Successful merges: - #128316 (Stabilize most of `io_error_more`) - #129473 (use `download-ci-llvm=true` in the default compiler config) - #129529 (Add test to build crates used by r-a on stable) - #129981 (Remove `serialized_bitcode` from `LtoModuleCodegen`.) - #130094 (Inform the solver if evaluation is concurrent) - #130132 ([illumos] enable SIGSEGV handler to detect stack overflows) - #130146 (bootstrap `naked_asm!` for `compiler-builtins`) - #130149 (Helper function for formatting with `LifetimeSuggestionPosition`) - #130152 (adapt a test for llvm 20) - #130162 (bump download-ci-llvm-stamp) - #130164 (move some const fn out of the const_ptr_as_ref feature) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/lto.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/lto.rs b/compiler/rustc_codegen_ssa/src/back/lto.rs index 8b6f6b5a220..1e1e039882b 100644 --- a/compiler/rustc_codegen_ssa/src/back/lto.rs +++ b/compiler/rustc_codegen_ssa/src/back/lto.rs @@ -41,18 +41,14 @@ pub struct ThinShared<B: WriteBackendMethods> { } pub enum LtoModuleCodegen<B: WriteBackendMethods> { - Fat { - module: ModuleCodegen<B::Module>, - _serialized_bitcode: Vec<SerializedModule<B::ModuleBuffer>>, - }, - + Fat(ModuleCodegen<B::Module>), Thin(ThinModule<B>), } impl<B: WriteBackendMethods> LtoModuleCodegen<B> { pub fn name(&self) -> &str { match *self { - LtoModuleCodegen::Fat { .. } => "everything", + LtoModuleCodegen::Fat(_) => "everything", LtoModuleCodegen::Thin(ref m) => m.name(), } } @@ -68,7 +64,7 @@ impl<B: WriteBackendMethods> LtoModuleCodegen<B> { cgcx: &CodegenContext<B>, ) -> Result<ModuleCodegen<B::Module>, FatalError> { match self { - LtoModuleCodegen::Fat { mut module, .. } => { + LtoModuleCodegen::Fat(mut module) => { B::optimize_fat(cgcx, &mut module)?; Ok(module) } @@ -81,7 +77,7 @@ impl<B: WriteBackendMethods> LtoModuleCodegen<B> { pub fn cost(&self) -> u64 { match *self { // Only one module with fat LTO, so the cost doesn't matter. - LtoModuleCodegen::Fat { .. } => 0, + LtoModuleCodegen::Fat(_) => 0, LtoModuleCodegen::Thin(ref m) => m.cost(), } } |
