Deprecate #[spirv(block)] and auto-wrap in "interface blocks" instead.

crates/rustc_codegen_spirv/src/abi.rs

@@ -237,7 +237,6 @@ impl<'tcx> ConvSpirvType<'tcx> for CastTarget {
  field_types: args,
  field_offsets,
  field_names: None,
- is_block: false,
  }
  .def(span, cx)
  }
@@ -325,34 +324,6 @@ fn trans_type_impl<'tcx>(
 ) -> Word {
  if let TyKind::Adt(adt, substs) = *ty.ty.kind() {
  let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_attrs(adt.did));
- if attrs.block.is_some() {
- if !adt.is_struct() {
- cx.tcx.sess.span_err(
- span,
- &format!(
- "`#[spirv(block)]` can only be used on a `struct`, \
- but `{}` is a `{}`",
- ty.ty,
- adt.descr(),
- ),
- );
- }
-
- if !matches!(ty.abi, Abi::Aggregate { .. }) {
- cx.tcx.sess.span_err(
- span,
- &format!(
- "`#[spirv(block)]` can only be used on aggregates, \
- but `{}` has `Abi::{:?}`",
- ty.ty, ty.abi,
- ),
- );
- }
-
- assert!(matches!(ty.fields, FieldsShape::Arbitrary { .. }));
-
- return trans_struct(cx, span, ty, true);
- }
 
  if let Some(intrinsic_type_attr) = attrs.intrinsic_type.map(|attr| attr.value) {
  if let Ok(spirv_type) = trans_intrinsic_type(cx, span, ty, substs, intrinsic_type_attr)
@@ -361,6 +332,7 @@ fn trans_type_impl<'tcx>(
  }
  }
  }
+
  // Note: ty.layout is orthogonal to ty.ty, e.g. `ManuallyDrop<Result<isize, isize>>` has abi
  // `ScalarPair`.
  // There's a few layers that we go through here. First we inspect layout.abi, then if relevant, layout.fields, etc.
@@ -372,7 +344,6 @@ fn trans_type_impl<'tcx>(
  field_types: Vec::new(),
  field_offsets: Vec::new(),
  field_names: None,
- is_block: false,
  }
  .def_with_name(cx, span, TyLayoutNameKey::from(ty)),
  Abi::Scalar(ref scalar) => trans_scalar(cx, span, ty, scalar, None, is_immediate),
@@ -392,7 +363,6 @@ fn trans_type_impl<'tcx>(
  field_types: vec![one_spirv, two_spirv],
  field_offsets: vec![one_offset, two_offset],
  field_names: None,
- is_block: false,
  }
  .def_with_name(cx, span, TyLayoutNameKey::from(ty))
  }
@@ -621,7 +591,6 @@ fn trans_aggregate<'tcx>(cx: &CodegenCx<'tcx>, span: Span, ty: TyAndLayout<'tcx>
  field_types: Vec::new(),
  field_offsets: Vec::new(),
  field_names: None,
- is_block: false,
  }
  .def_with_name(cx, span, TyLayoutNameKey::from(ty))
  } else {
@@ -642,7 +611,7 @@ fn trans_aggregate<'tcx>(cx: &CodegenCx<'tcx>, span: Span, ty: TyAndLayout<'tcx>
  FieldsShape::Arbitrary {
  offsets: _,
  memory_index: _,
- } => trans_struct(cx, span, ty, false),
+ } => trans_struct(cx, span, ty),
  }
 }
 
@@ -672,12 +641,7 @@ pub fn auto_struct_layout<'tcx>(
 }
 
 // see struct_llfields in librustc_codegen_llvm for implementation hints
-fn trans_struct<'tcx>(
- cx: &CodegenCx<'tcx>,
- span: Span,
- ty: TyAndLayout<'tcx>,
- is_block: bool,
-) -> Word {
+fn trans_struct<'tcx>(cx: &CodegenCx<'tcx>, span: Span, ty: TyAndLayout<'tcx>) -> Word {
  if let TyKind::Foreign(_) = ty.ty.kind() {
  // "An unsized FFI type that is opaque to Rust", `extern type A;` (currently unstable)
  if cx.kernel_mode {
@@ -726,7 +690,6 @@ fn trans_struct<'tcx>(
  field_types,
  field_offsets,
  field_names: Some(field_names),
- is_block,
  }
  .def_with_name(cx, span, TyLayoutNameKey::from(ty))
 }

crates/rustc_codegen_spirv/src/attr.rs

@@ -367,6 +367,16 @@ impl CheckSpirvAttrVisitor<'_> {
  },
  }
  }
+
+ // At this point we have all of the attributes (valid for this target),
+ // so we can perform further checks, emit warnings, etc.
+
+ if let Some(block_attr) = aggregated_attrs.block {
+ self.tcx.sess.span_warn(
+ block_attr.span,
+ "#[spirv(block)] is no longer needed and should be removed",
+ );
+ }
  }
 }
 

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

@@ -232,6 +232,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
  SpirvType::Image { .. } => self.fatal("cannot memset image"),
  SpirvType::Sampler => self.fatal("cannot memset sampler"),
  SpirvType::SampledImage { .. } => self.fatal("cannot memset sampled image"),
+ SpirvType::InterfaceBlock { .. } => self.fatal("cannot memset interface block"),
  }
  }
 
@@ -288,6 +289,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
  SpirvType::Image { .. } => self.fatal("cannot memset image"),
  SpirvType::Sampler => self.fatal("cannot memset sampler"),
  SpirvType::SampledImage { .. } => self.fatal("cannot memset sampled image"),
+ SpirvType::InterfaceBlock { .. } => self.fatal("cannot memset interface block"),
  }
  }
 
@@ -1041,6 +1043,10 @@ impl<'a, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'tcx> {
  SpirvType::Array { element, .. }
  | SpirvType::RuntimeArray { element, .. }
  | SpirvType::Vector { element, .. } => element,
+ SpirvType::InterfaceBlock { inner_type } => {
+ assert_eq!(idx, 0);
+ inner_type
+ }
  other => self.fatal(&format!(
  "struct_gep not on struct, array, or vector type: {:?}, index {}",
  other, idx

crates/rustc_codegen_spirv/src/codegen_cx/constant.rs

@@ -180,7 +180,6 @@ impl<'tcx> ConstMethods<'tcx> for CodegenCx<'tcx> {
  field_types,
  field_offsets,
  field_names: None,
- is_block: false,
  }
  .def(DUMMY_SP, self);
  self.constant_composite(struct_ty, elts.iter().map(|f| f.def_cx(self)).collect())
@@ -524,6 +523,10 @@ impl<'tcx> CodegenCx<'tcx> {
  .tcx
  .sess
  .fatal("Cannot create a constant sampled image value"),
+ SpirvType::InterfaceBlock { .. } => self
+ .tcx
+ .sess
+ .fatal("Cannot create a constant interface block value"),
  }
  }
 }