Updated arguments and return types

dvdplm · dvdplm · commit 75dfd3fa3b61 · 2025-11-05T15:38:43.000+01:00
diff --git a/crates/rustc_codegen_spirv/src/lib.rs b/crates/rustc_codegen_spirv/src/lib.rs
@@ -153,10 +153,9 @@ use maybe_pqp_cg_ssa::traits::{
 };
 use maybe_pqp_cg_ssa::{CodegenResults, CompiledModule, ModuleCodegen, ModuleKind, TargetConfig};
 use rspirv::binary::Assemble;
-use rustc_ast::expand::allocator::AllocatorKind;
-use rustc_ast::expand::autodiff_attrs::AutoDiffItem;
+use rustc_ast::expand::allocator::AllocatorMethod;
 use rustc_data_structures::fx::FxIndexMap;
-use rustc_errors::{DiagCtxtHandle, FatalError};
+use rustc_errors::DiagCtxtHandle;
 use rustc_metadata::EncodedMetadata;
 use rustc_middle::dep_graph::{WorkProduct, WorkProductId};
 use rustc_middle::mir::mono::{MonoItem, MonoItemData};
@@ -283,6 +282,10 @@ impl CodegenBackend for SpirvCodegenBackend {
         );
         drop(timer);
     }
+
+    fn name(&self) -> &'static str {
+        "SpirvCodegenBackend"
+    }
 }
 
 struct SpirvModuleBuffer(Vec<u32>);
@@ -301,16 +304,16 @@ impl ThinBufferMethods for SpirvModuleBuffer {
     fn data(&self) -> &[u8] {
         self.as_bytes()
     }
-    fn thin_link_data(&self) -> &[u8] {
-        &[]
-    }
+    // fn thin_link_data(&self) -> &[u8] {
+    //     &[]
+    // }
 }
 
 impl SpirvCodegenBackend {
     fn optimize_common(
         _cgcx: &CodegenContext<Self>,
         module: &mut ModuleCodegen<<Self as WriteBackendMethods>::Module>,
-    ) -> Result<(), FatalError> {
+    ) -> () {
         // Apply DCE ("dead code elimination") to modules before ever serializing
         // them as `.spv` files (technically, `.rcgu.o` files inside `.rlib`s),
         // that will later get linked (potentially many times, esp. if this is
@@ -320,7 +323,7 @@ impl SpirvCodegenBackend {
 
         // FIXME(eddyb) run as many optimization passes as possible, not just DCE.
 
-        Ok(())
+        ()
     }
 }
 
@@ -341,8 +344,8 @@ impl WriteBackendMethods for SpirvCodegenBackend {
         _exported_symbols_for_lto: &[String],
         _each_linked_rlib_for_lto: &[PathBuf],
         _modules: Vec<FatLtoInput<Self>>,
-        _diff_fncs: Vec<AutoDiffItem>,
-    ) -> Result<ModuleCodegen<Self::Module>, FatalError> {
+        // _diff_fncs: Vec<AutoDiffItem>,
+    ) -> ModuleCodegen<Self::Module> {
         assert!(
             cgcx.lto == rustc_session::config::Lto::Fat,
             "`run_and_optimize_fat_lto` (for `WorkItemResult::NeedsFatLto`) should \
@@ -358,7 +361,7 @@ impl WriteBackendMethods for SpirvCodegenBackend {
         _each_linked_rlib_for_lto: &[PathBuf], // njn: ?
         modules: Vec<(String, Self::ThinBuffer)>,
         cached_modules: Vec<(SerializedModule<Self::ModuleBuffer>, WorkProduct)>,
-    ) -> Result<(Vec<ThinModule<Self>>, Vec<WorkProduct>), FatalError> {
+    ) -> (Vec<ThinModule<Self>>, Vec<WorkProduct>) {
         link::run_thin(cgcx, modules, cached_modules)
     }
 
@@ -375,14 +378,14 @@ impl WriteBackendMethods for SpirvCodegenBackend {
         _dcx: DiagCtxtHandle<'_>,
         module: &mut ModuleCodegen<Self::Module>,
         _config: &ModuleConfig,
-    ) -> Result<(), FatalError> {
+    ) -> () {
         Self::optimize_common(cgcx, module)
     }
 
     fn optimize_thin(
         cgcx: &CodegenContext<Self>,
         thin_module: ThinModule<Self>,
-    ) -> Result<ModuleCodegen<Self::Module>, FatalError> {
+    ) -> ModuleCodegen<Self::Module> {
         // FIXME(eddyb) the inefficiency of Module -> [u8] -> Module roundtrips
         // comes from upstream and it applies to `rustc_codegen_llvm` as well,
         // eventually it should be properly addressed (for `ThinLocal` at least).
@@ -395,15 +398,15 @@ impl WriteBackendMethods for SpirvCodegenBackend {
             kind: ModuleKind::Regular,
             thin_lto_buffer: None,
         };
-        Self::optimize_common(cgcx, &mut module)?;
-        Ok(module)
+        Self::optimize_common(cgcx, &mut module);
+        module
     }
 
     fn codegen(
         cgcx: &CodegenContext<Self>,
         module: ModuleCodegen<Self::Module>,
         _config: &ModuleConfig,
-    ) -> Result<CompiledModule, FatalError> {
+    ) -> CompiledModule {
         let kind = module.kind;
         let (name, module_buffer) = Self::serialize_module(module);
 
@@ -414,7 +417,7 @@ impl WriteBackendMethods for SpirvCodegenBackend {
         );
         fs::write(&path, module_buffer.as_bytes()).unwrap();
 
-        Ok(CompiledModule {
+        CompiledModule {
             name,
             kind,
             object: Some(path),
@@ -423,13 +426,10 @@ impl WriteBackendMethods for SpirvCodegenBackend {
             assembly: None,
             llvm_ir: None,
             links_from_incr_cache: vec![],
-        })
+        }
     }
 
-    fn prepare_thin(
-        module: ModuleCodegen<Self::Module>,
-        _want_summary: bool,
-    ) -> (String, Self::ThinBuffer) {
+    fn prepare_thin(module: ModuleCodegen<Self::Module>) -> (String, Self::ThinBuffer) {
         Self::serialize_module(module)
     }
 
@@ -442,13 +442,7 @@ impl WriteBackendMethods for SpirvCodegenBackend {
 }
 
 impl ExtraBackendMethods for SpirvCodegenBackend {
-    fn codegen_allocator(
-        &self,
-        _: TyCtxt<'_>,
-        _: &str,
-        _: AllocatorKind,
-        _: AllocatorKind,
-    ) -> Self::Module {
+    fn codegen_allocator(&self, _: TyCtxt<'_>, _: &str, _: &[AllocatorMethod]) -> Self::Module {
         todo!()
     }
 
diff --git a/crates/rustc_codegen_spirv/src/link.rs b/crates/rustc_codegen_spirv/src/link.rs
@@ -6,13 +6,13 @@ use crate::{SpirvCodegenBackend, SpirvModuleBuffer, linker};
 use ar::{Archive, GnuBuilder, Header};
 use rspirv::binary::Assemble;
 use rspirv::dr::Module;
-use rustc_ast::CRATE_NODE_ID;
 use rustc_codegen_spirv_types::{CompileResult, ModuleResult};
 use rustc_codegen_ssa::back::lto::{SerializedModule, ThinModule, ThinShared};
 use rustc_codegen_ssa::back::write::CodegenContext;
 use rustc_codegen_ssa::{CodegenResults, NativeLib};
 use rustc_data_structures::fx::FxHashSet;
-use rustc_errors::{Diag, FatalError};
+use rustc_errors::Diag;
+use rustc_hir::attrs::NativeLibKind;
 use rustc_metadata::{EncodedMetadata, fs::METADATA_FILENAME};
 use rustc_middle::bug;
 use rustc_middle::dep_graph::WorkProduct;
@@ -22,7 +22,6 @@ use rustc_session::config::{
     CrateType, DebugInfo, Lto, OptLevel, OutFileName, OutputFilenames, OutputType,
 };
 use rustc_session::output::{check_file_is_writeable, invalid_output_for_target, out_filename};
-use rustc_session::utils::NativeLibKind;
 use rustc_span::Symbol;
 use std::collections::BTreeMap;
 use std::ffi::{CString, OsStr};
@@ -494,11 +493,12 @@ fn add_upstream_native_libraries(
 
 // FIXME(eddyb) upstream has code like this already, maybe we can reuse most of it?
 // (see `compiler/rustc_codegen_ssa/src/back/link.rs`)
-fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
-    match lib.cfg {
-        Some(ref cfg) => rustc_attr_parsing::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
-        None => true,
-    }
+fn relevant_lib(_sess: &Session, _lib: &NativeLib) -> bool {
+    true
+    // match lib.cfg {
+    //     Some(ref cfg) => rustc_attr_parsing::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
+    //     None => true,
+    // }
 }
 
 fn create_archive(files: &[&Path], metadata: &[u8], out_filename: &Path) {
@@ -634,7 +634,7 @@ pub(crate) fn run_thin(
     cgcx: &CodegenContext<SpirvCodegenBackend>,
     modules: Vec<(String, SpirvModuleBuffer)>,
     cached_modules: Vec<(SerializedModule<SpirvModuleBuffer>, WorkProduct)>,
-) -> Result<(Vec<ThinModule<SpirvCodegenBackend>>, Vec<WorkProduct>), FatalError> {
+) -> (Vec<ThinModule<SpirvCodegenBackend>>, Vec<WorkProduct>) {
     if cgcx.opts.cg.linker_plugin_lto.enabled() {
         unreachable!("We should never reach this case if the LTO step is deferred to the linker");
     }
@@ -674,5 +674,5 @@ pub(crate) fn run_thin(
         });
     }
 
-    Ok((opt_jobs, vec![]))
+    (opt_jobs, vec![])
 }
diff --git a/crates/rustc_codegen_spirv/src/linker/test.rs b/crates/rustc_codegen_spirv/src/linker/test.rs
@@ -7,12 +7,6 @@ use rustc_span::FileName;
 use std::io::Write;
 use std::sync::{Arc, Mutex};
 
-// `termcolor` is needed because we cannot construct an Emitter after it was added in
-// https://github.com/rust-lang/rust/pull/114104. This can be removed when
-// https://github.com/rust-lang/rust/pull/115393 lands.
-// We need to construct an emitter as yet another workaround,
-// see https://github.com/rust-lang/rust/pull/102992.
-extern crate termcolor;
 use termcolor::{ColorSpec, WriteColor};
 
 // https://github.com/colin-kiegel/rust-pretty-assertions/issues/24
@@ -162,7 +156,7 @@ fn link_with_linker_opts(
                 rustc_interface::util::rustc_version_str().unwrap_or("unknown"),
                 Default::default(),
                 &rustc_driver_impl::USING_INTERNAL_FEATURES,
-                Default::default(),
+                // Default::default(),
             );
 
             // HACK(eddyb) inject `write_diags` into `sess`, to work around
@@ -193,6 +187,7 @@ fn link_with_linker_opts(
                     "".into(),
                     None,
                     None,
+                    None,
                     "".into(),
                     OutputTypes::new(&[]),
                 ),
