Amend r326665 to print out the `used` attribute subjects in a different order.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@326676 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 5969c161f78ced8d83447def95e3a7340afa1d0c..92d1dd60151e23b2084575208b9f4ea401f15d23 100644 (file)
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -2010,7 +2010,7 @@ def Unused : InheritableAttr {
 
 def Used : InheritableAttr {
   let Spellings = [GCC<"used">];
-  let Subjects = SubjectList<[Function, ObjCMethod, NonLocalVar]>;
+  let Subjects = SubjectList<[NonLocalVar, Function, ObjCMethod]>;
   let Documentation = [Undocumented];
 }
 

diff --git a/test/Sema/attr-used.c b/test/Sema/attr-used.c
index 344c772301c4fccfa1ad7d709d28e8df3ce382dc..c13d57c95e614b0da9565c01a5e403b351fb338b 100644 (file)
--- a/test/Sema/attr-used.c
+++ b/test/Sema/attr-used.c
@@ -3,7 +3,7 @@
 extern int l0 __attribute__((used)); // expected-warning {{'used' attribute ignored}}
 __private_extern__ int l1 __attribute__((used)); // expected-warning {{'used' attribute ignored}}
 
-struct __attribute__((used)) s { // expected-warning {{'used' attribute only applies to functions, Objective-C methods, and variables with non-local storage}}
+struct __attribute__((used)) s { // expected-warning {{'used' attribute only applies to variables with non-local storage, functions, and Objective-C methods}}
   int x;
 };
 
@@ -14,7 +14,7 @@ static void __attribute__((used)) f0(void) {
 
 void f1() {
   static int a __attribute__((used));
-  int b __attribute__((used)); // expected-warning {{'used' attribute only applies to functions, Objective-C methods, and variables with non-local storage}}
+  int b __attribute__((used)); // expected-warning {{'used' attribute only applies to variables with non-local storage, functions, and Objective-C methods}}
 }
 
 static void __attribute__((used)) f0(void);