Allow parsing of #[spirv(...)] attribute without CodegenCx

Author: Firestar99

crates/rustc_codegen_spirv/src/abi.rs

@@ -546,7 +546,11 @@ impl<'tcx> ConvSpirvType<'tcx> for TyAndLayout<'tcx> {
                 span = cx.tcx.def_span(adt.did());
             }
 
-            let attrs = AggregatedSpirvAttributes::parse(cx, cx.tcx.get_attrs_unchecked(adt.did()));
+            let attrs = AggregatedSpirvAttributes::parse(
+                cx.tcx,
+                &cx.sym,
+                cx.tcx.get_attrs_unchecked(adt.did()),
+            );
 
             if let Some(intrinsic_type_attr) = attrs.intrinsic_type.map(|attr| attr.value)
                 && let Ok(spirv_type) =

crates/rustc_codegen_spirv/src/attr.rs

@@ -2,7 +2,6 @@
 //!
 //! The attribute-checking parts of this try to follow `rustc_passes::check_attr`.
 
-use crate::codegen_cx::CodegenCx;
 use crate::symbols::Symbols;
 use rspirv::spirv::{BuiltIn, ExecutionMode, ExecutionModel, StorageClass};
 use rustc_hir as hir;
@@ -147,16 +146,16 @@ impl AggregatedSpirvAttributes {
     ///
     /// Any errors for malformed/duplicate attributes will have been reported
     /// prior to codegen, by the `attr` check pass.
-    pub fn parse<'tcx>(cx: &CodegenCx<'tcx>, attrs: &'tcx [Attribute]) -> Self {
+    pub fn parse<'tcx>(tcx: TyCtxt<'tcx>, sym: &Symbols, attrs: &'tcx [Attribute]) -> Self {
         let mut aggregated_attrs = Self::default();
 
         // NOTE(eddyb) `span_delayed_bug` ensures that if attribute checking fails
         // to see an attribute error, it will cause an ICE instead.
-        for parse_attr_result in crate::symbols::parse_attrs_for_checking(&cx.sym, attrs) {
+        for parse_attr_result in crate::symbols::parse_attrs_for_checking(sym, attrs) {
             let (span, parsed_attr) = match parse_attr_result {
                 Ok(span_and_parsed_attr) => span_and_parsed_attr,
                 Err((span, msg)) => {
-                    cx.tcx.dcx().span_delayed_bug(span, msg);
+                    tcx.dcx().span_delayed_bug(span, msg);
                     continue;
                 }
             };
@@ -166,8 +165,7 @@ impl AggregatedSpirvAttributes {
                     prev_span: _,
                     category,
                 }) => {
-                    cx.tcx
-                        .dcx()
+                    tcx.dcx()
                         .span_delayed_bug(span, format!("multiple {category} attributes"));
                 }
             }

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -133,7 +133,11 @@ impl<'tcx> CodegenCx<'tcx> {
             self.set_linkage(fn_id, symbol_name.to_owned(), linkage);
         }
 
-        let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.get_attrs_unchecked(def_id));
+        let attrs = AggregatedSpirvAttributes::parse(
+            self.tcx,
+            &self.sym,
+            self.tcx.get_attrs_unchecked(def_id),
+        );
         if let Some(entry) = attrs.entry.map(|attr| attr.value) {
             // HACK(eddyb) early insert to let `shader_entry_stub` call this
             // very function via `get_fn_addr`.

crates/rustc_codegen_spirv/src/codegen_cx/entry.rs

@@ -433,7 +433,11 @@ impl<'tcx> CodegenCx<'tcx> {
         call_args: &mut Vec<SpirvValue>,
         decoration_locations: &mut FxHashMap<StorageClass, u32>,
     ) {
-        let attrs = AggregatedSpirvAttributes::parse(self, self.tcx.hir_attrs(hir_param.hir_id));
+        let attrs = AggregatedSpirvAttributes::parse(
+            self.tcx,
+            &self.sym,
+            self.tcx.hir_attrs(hir_param.hir_id),
+        );
 
         let EntryParamDeducedFromRustRefOrValue {
             value_layout,