Fixed parsing of attributes, fix test

Author: nebulark

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -460,6 +460,23 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
                     let mut prefix = None;
                     let mut entry = None;
                     for item in l {
+                        let Some(metaitem) = item.meta_item() else {
+                            continue;
+                        };
+
+                        let [single_segment] = &metaitem.path.segments[..] else {
+                            continue;
+                        };
+
+                        let attrib_to_write = match single_segment.ident.name {
+                            sym::prefix_nops => &mut prefix,
+                                sym::entry_nops => &mut entry,
+                                x => {
+                                    tcx.dcx().span_err(metaitem.span, "Unexpected parameter.");
+                                    continue;
+                                }
+                        };
+
                         if let Some(metaitem) =
                             item.meta_item().map(|e| e.name_value_literal()).flatten()
                         {
@@ -479,14 +496,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
                                 continue;
                             };
 
-                            match metaitem.symbol {
-                                sym::prefix => prefix = Some(val),
-                                sym::entry => entry = Some(val),
-                                _ => {
-                                    tcx.dcx().span_err(metaitem.span, "Unexpected parameter.");
-                                    continue;
-                                }
-                            }
+                            *attrib_to_write = Some(val);
                         }
                     }
                     if let (None, None) = (prefix, entry) {

compiler/rustc_span/src/symbol.rs

@@ -754,7 +754,7 @@ symbols! {
         enable,
         encode,
         end,
-        entry,
+        entry_nops,
         enumerate_method,
         env,
         env_CFG_RELEASE: env!("CFG_RELEASE"),
@@ -1399,7 +1399,7 @@ symbols! {
         prefetch_read_instruction,
         prefetch_write_data,
         prefetch_write_instruction,
-        prefix,
+        prefix_nops,
         preg,
         prelude,
         prelude_import,

tests/codegen/patchable-function-entry.rs

@@ -9,7 +9,7 @@ pub fn foo() {}
 
 // The attribute should override the compile flags
 #[no_mangle]
-#[patchable_function_entry(prefix_nops = 1, entry_nops = 2))]
+#[patchable_function_entry(prefix_nops = 1, entry_nops = 2)]
 pub fn bar() {}
 
 // If we override an attribute to 0 or unset, the attribute should go away