Change number of arguments check. Add test for it. And move the diagnostic messages to the same line.

Author: bwendling

clang/lib/Sema/SemaType.cpp

@@ -7943,10 +7943,9 @@ static bool handleFunctionTypeAttr(TypeProcessingState &state, ParsedAttr &attr,
   }
 
   if (attr.getKind() == ParsedAttr::AT_CFISalt) {
-    if (attr.getNumArgs() == 0)
+    if (attr.getNumArgs() != 1)
       return true;
 
-    // Delay if this is not a function type.
     StringRef Argument;
     if (!S.checkStringLiteralArgumentAttr(attr, 0, Argument))
       return false;

clang/test/Sema/attr-cfi-salt.c

@@ -2,10 +2,10 @@
 
 #define __cfi_salt(S) __attribute__((cfi_salt(S)))
 
-int bad1() __cfi_salt();
-    // expected-error@-1{{'cfi_salt' attribute takes one argument}}
-int bad2() __cfi_salt(42);
-    // expected-error@-1{{expected string literal as argument of 'cfi_salt' attribute}}
+int bad1() __cfi_salt(); // expected-error{{'cfi_salt' attribute takes one argument}}
+int bad2() __cfi_salt(42); // expected-error{{expected string literal as argument of 'cfi_salt' attribute}}
+int bad3() __attribute__((cfi_salt("a", "b", "c"))); // expected-error{{'cfi_salt' attribute takes one argument}}
+
 
 int foo(int a, int b) __cfi_salt("pepper"); // ok
 int foo(int a, int b) __cfi_salt("pepper"); // ok
@@ -17,51 +17,35 @@ typedef int (*bar_t)(void) __cfi_salt("pepper"); // ok
 // int b(void) __cfi_salt("salt 'n") __cfi_salt("pepper");
 // bar_t bar_fn __cfi_salt("salt 'n");
 
-int baz __cfi_salt("salt");
-    // expected-warning@-1{{'cfi_salt' only applies to function types}}
+int baz __cfi_salt("salt"); // expected-warning{{'cfi_salt' only applies to function types}}
 
-int baz_fn(int a, int b) __cfi_salt("salt 'n");
-    // expected-note@-1{{previous declaration is here}}
-int baz_fn(int a, int b) __cfi_salt("pepper");
-    // expected-error@-1{{conflicting types for 'baz_fn'}}
+int baz_fn(int a, int b) __cfi_salt("salt 'n"); // expected-note{{previous declaration is here}}
+int baz_fn(int a, int b) __cfi_salt("pepper"); // expected-error{{conflicting types for 'baz_fn'}}
 
-int mux_fn(int a, int b) __cfi_salt("salt 'n");
-    // expected-note@-1{{previous declaration is here}}
-int mux_fn(int a, int b) __cfi_salt("pepper") {
-    // expected-error@-1{{conflicting types for 'mux_fn'}}
+int mux_fn(int a, int b) __cfi_salt("salt 'n"); // expected-note{{previous declaration is here}}
+int mux_fn(int a, int b) __cfi_salt("pepper") { // expected-error{{conflicting types for 'mux_fn'}}
   return a * b;
 }
 
-typedef int qux_t __cfi_salt("salt");
-    // expected-warning@-1{{'cfi_salt' only applies to function types}}
+typedef int qux_t __cfi_salt("salt"); // expected-warning{{'cfi_salt' only applies to function types}}
 
-typedef int (*quux_t)(void) __cfi_salt("salt 'n");
-    // expected-note@-1{{previous definition is here}}
-typedef int (*quux_t)(void) __cfi_salt("pepper");
-    // expected-error@-1{{typedef redefinition with different type}}
+typedef int (*quux_t)(void) __cfi_salt("salt 'n"); // expected-note{{previous definition is here}}
+typedef int (*quux_t)(void) __cfi_salt("pepper"); // expected-error{{typedef redefinition with different type}}
 
-void func1(int a) __cfi_salt("pepper");
-    // expected-note@-1{{previous declaration is here}}
-void func1(int a) { }
-    // expected-error@-1{{conflicting types for 'func1'}}
-void (*fp1)(int) = func1;
-    // expected-error@-1{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
+void func1(int a) __cfi_salt("pepper"); // expected-note{{previous declaration is here}}
+void func1(int a) { } // expected-error{{conflicting types for 'func1'}}
+void (*fp1)(int) = func1; // expected-error{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
 
-void func2(int) [[clang::cfi_salt("test")]];
-    // expected-note@-1{{previous declaration is here}}
-void func2(int a) { }
-    // expected-error@-1{{conflicting types for 'func2'}}
-void (*fp2)(int) = func2;
-    // expected-error@-1{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
+void func2(int) [[clang::cfi_salt("test")]]; // expected-note{{previous declaration is here}}
+void func2(int a) { } // expected-error{{conflicting types for 'func2'}}
+void (*fp2)(int) = func2; // expected-error{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
 
 void func3(int) __cfi_salt("pepper"); // ok
 void func3(int a) __cfi_salt("pepper") { } // ok
 void (* __cfi_salt("pepper") fp3)(int) = func3; // ok
-void (*fp3_noattr)(int) = func3;
-    // expected-error@-1{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
+void (*fp3_noattr)(int) = func3; // expected-error{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
 
 void func4(int) [[clang::cfi_salt("test")]]; // ok
 void func4(int a) [[clang::cfi_salt("test")]] { } // ok
 void (* [[clang::cfi_salt("test")]] fp4)(int) = func4; // ok
-void (*fp4_noattr)(int) = func4;
-    // expected-error@-1{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}
+void (*fp4_noattr)(int) = func4; // expected-error{{incompatible function pointer types initializing 'void (*)(int)' with an expression of type 'void (int)'}}