abi layout compiletest: fix invalid-matrix-type

Author: Firestar99

crates/rustc_codegen_spirv/src/abi.rs

@@ -982,6 +982,10 @@ fn def_id_for_spirv_type_adt(layout: TyAndLayout<'_>) -> Option<DefId> {
     }
 }
 
+fn span_for_spirv_type_adt(cx: &CodegenCx<'_>, layout: TyAndLayout<'_>) -> Option<Span> {
+    def_id_for_spirv_type_adt(layout).map(|did| cx.tcx.def_span(did))
+}
+
 /// Minimal and cheaply comparable/hashable subset of the information contained
 /// in `TyLayout` that can be used to generate a name (assuming a nominal type).
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
@@ -1231,6 +1235,7 @@ fn trans_intrinsic_type<'tcx>(
             }
         }
         IntrinsicType::Matrix => {
+            let span = span_for_spirv_type_adt(cx, ty).unwrap();
             let (element, count) =
                 trans_glam_like_struct(cx, span, ty, args, "`#[spirv(matrix)]`")?;
             match cx.lookup_type(element) {
@@ -1247,6 +1252,7 @@ fn trans_intrinsic_type<'tcx>(
             Ok(SpirvType::Matrix { element, count }.def(span, cx))
         }
         IntrinsicType::Vector => {
+            let span = span_for_spirv_type_adt(cx, ty).unwrap();
             let (element, count) =
                 trans_glam_like_struct(cx, span, ty, args, "`#[spirv(vector)]`")?;
             match cx.lookup_type(element) {

tests/compiletests/ui/spirv-attr/invalid-matrix-type-empty.stderr

@@ -1,4 +1,4 @@
-error: #[spirv(matrix)] type must have at least two fields
+error: `#[spirv(matrix)]` member types must all be the same
  --> $DIR/invalid-matrix-type-empty.rs:7:1
   |
 7 | pub struct EmptyStruct {}

tests/compiletests/ui/spirv-attr/invalid-matrix-type.stderr

@@ -1,18 +1,18 @@
-error: #[spirv(matrix)] type must have at least two fields
+error: `#[spirv(matrix)]` must have at least 2 members
  --> $DIR/invalid-matrix-type.rs:7:1
   |
 7 | pub struct _FewerFields {
   | ^^^^^^^^^^^^^^^^^^^^^^^
 
-error: #[spirv(matrix)] type fields must all be vectors
+error: `#[spirv(matrix)]` type fields must all be vectors
   --> $DIR/invalid-matrix-type.rs:12:1
    |
 12 | pub struct _NotVectorField {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: field type is f32
 
-error: #[spirv(matrix)] type fields must all be the same type
+error: `#[spirv(matrix)]` member types must all be the same
   --> $DIR/invalid-matrix-type.rs:19:1
    |
 19 | pub struct _DifferentType {