Remove duplicate, nonsense information from an attribute diagnostic. The NonParmVar...

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

diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 8182ada8595db4605c02353c3e7edd8877f7f855..a13052a3b80b01cb7f4230c5eea69ade2f677fb3 100644 (file)
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -87,7 +87,7 @@ def NormalVar : SubsetSubject<Var,
                               "local variables">;
 def NonParmVar : SubsetSubject<Var,
                                [{S->getKind() != Decl::ParmVar}],
-                               "variables and functions">;
+                               "variables">;
 def NonBitField : SubsetSubject<Field,
                                 [{!S->isBitField()}],
                                 "non-bit-field non-static data members">;

diff --git a/test/Sema/attr-nodebug.c b/test/Sema/attr-nodebug.c
index 64383e0f837b2cc4a13cb23d5970b2b378e0a987..355778411d3ee64da42f58f647bd4c467300e5ce 100644 (file)
--- a/test/Sema/attr-nodebug.c
+++ b/test/Sema/attr-nodebug.c
@@ -2,7 +2,7 @@
 
 int a __attribute__((nodebug));
 
-void b(int p __attribute__((nodebug))) { // expected-warning {{'nodebug' attribute only applies to functions, function pointers, Objective-C methods, and variables and functions}}
+void b(int p __attribute__((nodebug))) { // expected-warning {{'nodebug' attribute only applies to functions, function pointers, Objective-C methods, and variables}}
   int b __attribute__((nodebug));
 }