make /// doc comments compatible with naked functions

folkertdev · folkertdev · commit 2ec26313256a · 2024-07-30T10:11:54.000+02:00
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
@@ -460,6 +460,12 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
             Target::Fn
             | Target::Method(MethodKind::Trait { body: true } | MethodKind::Inherent) => {
                 for other_attr in attrs {
+                    // this covers "sugared doc comments" of the form `/// ...`
+                    // it does not cover `#[doc = "..."]`, which is handled below
+                    if other_attr.is_doc_comment() {
+                        continue;
+                    }
+
                     if !ALLOW_LIST.iter().any(|name| other_attr.has_name(*name)) {
                         self.dcx().emit_err(errors::NakedFunctionIncompatibleAttribute {
                             span: other_attr.span,
diff --git a/tests/ui/asm/naked-functions.rs b/tests/ui/asm/naked-functions.rs
@@ -239,6 +239,8 @@ pub unsafe extern "C" fn compatible_target_feature() {
 }
 
 #[doc = "foo bar baz"]
+/// a doc comment
+// a normal comment
 #[naked]
 pub unsafe extern "C" fn compatible_doc_attributes() {
     asm!("", options(noreturn, raw));

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,8 @@ pub unsafe extern "C" fn compatible_target_feature() {`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`#[doc = "foo bar baz"]`
	`242`	`+/// a doc comment`
	`243`	`+// a normal comment`
`242`	`244`	`#[naked]`
`243`	`245`	`pub unsafe extern "C" fn compatible_doc_attributes() {`
`244`	`246`	`asm!("", options(noreturn, raw));`