More new trait methods, changes return types and error variants

Author: dvdplm

Cargo.lock

@@ -67,6 +67,7 @@ rustc_codegen_spirv-target-specs.workspace = true
 
 [dev-dependencies]
 pretty_assertions = "1.0"
+termcolor = "1.1.3"
 
 # HACK(eddyb) can't re-introduce deps of `rustc_codegen_ssa`, for `pqp_cg_ssa`
 # (see `build.rs`).

crates/rustc_codegen_spirv/Cargo.toml

@@ -2795,6 +2795,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         _src_align: Align,
         size: Self::Value,
         flags: MemFlags,
+        tt: Option<rustc_ast::expand::typetree::FncTree>,
     ) {
         if flags != MemFlags::empty() {
             self.err(format!(
@@ -2881,7 +2882,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         size: Self::Value,
         flags: MemFlags,
     ) {
-        self.memcpy(dst, dst_align, src, src_align, size, flags);
+        self.memcpy(dst, dst_align, src, src_align, size, flags, None);
     }
 
     fn memset(
@@ -3127,6 +3128,7 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
         dst: Self::Value,
         src: Self::Value,
         order: AtomicOrdering,
+        _ret_ptr: bool,
     ) -> Self::Value {
         let ty = src.ty;
 

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -182,7 +182,7 @@ impl<'a, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'tcx> {
         _direct_offset: Size,
         // NB: each offset implies a deref (i.e. they're steps in a pointer chain).
         _indirect_offsets: &[Size],
-        _fragment: Option<Range<Size>>,
+        _fragment: &Option<Range<Size>>,
     ) {
         todo!()
     }
@@ -202,6 +202,21 @@ impl<'a, 'tcx> DebugInfoBuilderMethods for Builder<'a, 'tcx> {
     fn set_var_name(&mut self, _value: Self::Value, _name: &str) {
         todo!()
     }
+
+    fn dbg_var_value(
+        &mut self,
+        _dbg_var: Self::DIVariable,
+        _dbg_loc: Self::DILocation,
+        _value: Self::Value,
+        _direct_offset: Size,
+        // NB: each offset implies a deref (i.e. they're steps in a pointer chain).
+        _indirect_offsets: &[Size],
+        // Byte range in the `dbg_var` covered by this fragment,
+        // if this is a fragment of a composite `DIVariable`.
+        _fragment: &Option<Range<Size>>,
+    ) {
+        todo!()
+    }
 }
 
 impl<'a, 'tcx> ArgAbiBuilderMethods<'tcx> for Builder<'a, 'tcx> {

crates/rustc_codegen_spirv/src/builder/mod.rs

@@ -506,8 +506,7 @@ impl<'tcx> CodegenCx<'tcx> {
 
                         // HACK(eddyb) these should never happen when using
                         // `read_scalar`, but better not outright crash.
-                        AllocError::ScalarSizeMismatch(_)
-                        | AllocError::OverwritePartialPointer(_) => {
+                        AllocError::ScalarSizeMismatch(_) => {
                             Err(format!("unrecognized `AllocError::{err:?}`"))
                         }
                     },