diff options
| author | bors <bors@rust-lang.org> | 2025-08-26 08:28:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-08-26 08:28:05 +0000 |
| commit | 4356e83c77cb28113411fb8e2219127f708095b5 (patch) | |
| tree | 8ded70b175401fd82c5af6d25c80b1465036ff93 /compiler/rustc_codegen_gcc/src/back/write.rs | |
| parent | ace9a74442aec13c75532d34e15d97428056866d (diff) | |
| parent | a21c2a6ef482b64dce8d57d503d7f4b34a792c74 (diff) | |
| download | rust-4356e83c77cb28113411fb8e2219127f708095b5.tar.gz rust-4356e83c77cb28113411fb8e2219127f708095b5.zip | |
Auto merge of #145871 - Zalathar:rollup-lag9tlg, r=Zalathar
Rollup of 12 pull requests Successful merges: - rust-lang/rust#143689 (Allow linking a prebuilt optimized compiler-rt builtins library) - rust-lang/rust#144885 (Implement some more checks in `ptr_guaranteed_cmp`. ) - rust-lang/rust#145535 (make rustdoc::invalid_html_tags more robust) - rust-lang/rust#145766 (test(rustfmt): Verify frontmatter is preserved) - rust-lang/rust#145811 (Fix some minor issues in comments) - rust-lang/rust#145814 (Handle unwinding fatal errors in codegen workers) - rust-lang/rust#145815 (Wait for DPkg frontend lock when trying to remove packages) - rust-lang/rust#145821 (compiletest: if a compiler fails, show its output) - rust-lang/rust#145845 (Make `x test distcheck` self-contained) - rust-lang/rust#145847 (Don't show warnings from xcrun with -Zverbose-internals) - rust-lang/rust#145856 (Update books) - rust-lang/rust#145858 (Update wasm-component-ld dependency) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/back/write.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/back/write.rs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_gcc/src/back/write.rs b/compiler/rustc_codegen_gcc/src/back/write.rs index c1231142c65..84bc7016271 100644 --- a/compiler/rustc_codegen_gcc/src/back/write.rs +++ b/compiler/rustc_codegen_gcc/src/back/write.rs @@ -6,7 +6,6 @@ use rustc_codegen_ssa::back::write::{BitcodeSection, CodegenContext, EmitObj, Mo use rustc_codegen_ssa::{CompiledModule, ModuleCodegen}; use rustc_fs_util::link_or_copy; use rustc_session::config::OutputType; -use rustc_span::fatal_error::FatalError; use rustc_target::spec::SplitDebuginfo; use crate::base::add_pic_option; @@ -17,7 +16,7 @@ pub(crate) fn codegen( cgcx: &CodegenContext<GccCodegenBackend>, module: ModuleCodegen<GccContext>, config: &ModuleConfig, -) -> Result<CompiledModule, FatalError> { +) -> CompiledModule { let dcx = cgcx.create_dcx(); let dcx = dcx.handle(); @@ -246,7 +245,7 @@ pub(crate) fn codegen( } } - Ok(module.into_compiled_module( + module.into_compiled_module( config.emit_obj != EmitObj::None, cgcx.target_can_use_split_dwarf && cgcx.split_debuginfo == SplitDebuginfo::Unpacked, config.emit_bc, @@ -254,7 +253,7 @@ pub(crate) fn codegen( config.emit_ir, &cgcx.output_filenames, cgcx.invocation_temp.as_deref(), - )) + ) } pub(crate) fn save_temp_bitcode( |