asm cfg: add additional tests

Author: folkertdev

tests/ui/asm/cfg-parse-error.rs

@@ -5,7 +5,6 @@ use std::arch::asm;
 
 fn main() {
     unsafe {
-        // Templates are not allowed after operands (even if the operands are configured out).
         asm!(
             "",
             #[cfg(false)]
@@ -28,19 +27,31 @@ fn main() {
             //~^ ERROR expected one of `#`, `clobber_abi`, `const`, `in`, `inlateout`, `inout`, `label`, `lateout`, `options`, `out`, or `sym`, found `""`
         );
 
-        // This is currently accepted because `const { 5 }` parses as an expression.
         asm!(
-            #[cfg(false)]
+            #[cfg_attr(true, cfg(false))]
             const {
                 5
             },
             "",
         );
-        // This is not accepted because `a = out(reg) x` is not a valid expresion.
+
+        // This is not accepted because `a = out(reg) x` is not a valid expression.
         asm!(
             #[cfg(false)]
             a = out(reg) x, //~ ERROR expected token: `,`
             "",
         );
+
+        // For now, any non-cfg attributes are rejected
+        asm!(
+            #[rustfmt::skip] //~ ERROR this attribute is not supported on assembly
+            "",
+        );
+
+        // For now, any non-cfg attributes are rejected
+        asm!(
+            #![rustfmt::skip] //~ ERROR an inner attribute is not permitted in this context
+            "",
+        );
     }
 }

tests/ui/asm/cfg-parse-error.stderr

@@ -1,24 +1,39 @@
 error: expected one of `#`, `clobber_abi`, `const`, `in`, `inlateout`, `inout`, `label`, `lateout`, `options`, `out`, or `sym`, found `""`
-  --> $DIR/cfg-parse-error.rs:17:13
+  --> $DIR/cfg-parse-error.rs:16:13
    |
 LL |             a = out(reg) x,
    |                            - expected one of 11 possible tokens
 LL |             "",
    |             ^^ unexpected token
 
 error: expected one of `#`, `clobber_abi`, `const`, `in`, `inlateout`, `inout`, `label`, `lateout`, `options`, `out`, or `sym`, found `""`
-  --> $DIR/cfg-parse-error.rs:27:13
+  --> $DIR/cfg-parse-error.rs:26:13
    |
 LL |             },
    |               - expected one of 11 possible tokens
 LL |             "",
    |             ^^ unexpected token
 
 error: expected token: `,`
-  --> $DIR/cfg-parse-error.rs:42:26
+  --> $DIR/cfg-parse-error.rs:41:26
    |
 LL |             a = out(reg) x,
    |                          ^ expected `,`
 
-error: aborting due to 3 previous errors
+error: this attribute is not supported on assembly
+  --> $DIR/cfg-parse-error.rs:47:13
+   |
+LL |             #[rustfmt::skip]
+   |             ^^^^^^^^^^^^^^^^
+
+error: an inner attribute is not permitted in this context
+  --> $DIR/cfg-parse-error.rs:53:13
+   |
+LL |             #![rustfmt::skip]
+   |             ^^^^^^^^^^^^^^^^^
+   |
+   = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files
+   = note: outer attributes, like `#[test]`, annotate the item following them
+
+error: aborting due to 5 previous errors
 

tests/ui/asm/cfg.rs

@@ -78,6 +78,28 @@ extern "C" fn first_template() -> u64 {
     )
 }
 
+#[unsafe(naked)]
+extern "C" fn true_and_false() -> u64 {
+    naked_asm!(
+        "mov rax, 5",
+        #[cfg(true)]
+        #[cfg(false)]
+        "mov rax, 10",
+        "ret",
+    )
+}
+
+#[unsafe(naked)]
+extern "C" fn false_and_true() -> u64 {
+    naked_asm!(
+        "mov rax, 5",
+        #[cfg(false)]
+        #[cfg(true)]
+        "mov rax, 10",
+        "ret",
+    )
+}
+
 pub fn main() {
     std::cfg_match! {
         reva => {
@@ -97,4 +119,7 @@ pub fn main() {
     }
     options();
     clobber_abi();
+
+    assert_eq!(true_and_false(), 5);
+    assert_eq!(false_and_true(), 5);
 }