Removing a custom error diagnostic and replacing it with a stock one. Added a test...

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

diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index a3d4f7f72dea06a527898d42c31e1ab29de4ffd0..6ae7d87cc2e0acf2a7e9fb61af77217e0f50b85b 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1868,8 +1868,6 @@ def err_attribute_zero_size : Error<"zero vector size">;
 def err_attribute_size_too_large : Error<"vector size too large">;
 def err_typecheck_vector_not_convertable : Error<
   "can't convert between vector values of different size (%0 and %1)">;
-def err_typecheck_ext_vector_not_typedef : Error<
-  "ext_vector_type only applies to types, not variables">;
 def err_ext_vector_component_exceeds_length : Error<
   "vector component access exceeds type %0">;
 def err_ext_vector_component_name_illegal : Error<
@@ -2041,7 +2039,7 @@ def warn_attribute_wrong_decl_type : Warning<
   "variables, functions and tag types|thread-local variables|"
   "variables and fields|variables, data members and tag types|"
   "types and namespaces|Objective-C interfaces|methods and properties|"
-  "struct or union|struct, union or class}1">,
+  "struct or union|struct, union or class|types}1">,
   InGroup<IgnoredAttributes>;
 def err_attribute_wrong_decl_type : Error<
   "%0 attribute only applies to %select{functions|unions|"
@@ -2052,7 +2050,7 @@ def err_attribute_wrong_decl_type : Error<
   "variables, functions and tag types|thread-local variables|"
   "variables and fields|variables, data members and tag types|"
   "types and namespaces|Objective-C interfaces|methods and properties|"
-  "struct or union|struct, union or class}1">;
+  "struct or union|struct, union or class|types}1">;
 def warn_type_attribute_wrong_type : Warning<
   "'%0' only applies to %select{function|pointer|"
   "Objective-C object or block pointer}1 types; type here is %2">,

diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp
index 4d0c6771e980dcd34941b8ee572f42a9dab58404..6f884435d9334d0760280b409531137c35238886 100644 (file)
--- a/lib/Sema/SemaDeclAttr.cpp
+++ b/lib/Sema/SemaDeclAttr.cpp
@@ -57,7 +57,8 @@ enum AttributeDeclKind {
   ExpectedObjectiveCInterface,
   ExpectedMethodOrProperty,
   ExpectedStructOrUnion,
-  ExpectedStructOrUnionOrClass
+  ExpectedStructOrUnionOrClass,
+  ExpectedType
 };
 
 //===----------------------------------------------------------------------===//
@@ -1249,7 +1250,8 @@ static void handleExtVectorTypeAttr(Sema &S, Scope *scope, Decl *D,
   if (TD == 0) {
     // __attribute__((ext_vector_type(N))) can only be applied to typedefs
     // and type-ids.
-    S.Diag(Attr.getLoc(), diag::err_typecheck_ext_vector_not_typedef);
+    S.Diag(Attr.getLoc(), diag::err_attribute_wrong_decl_type) <<
+      Attr.getName() << ExpectedType;
     return;
   }
 

diff --git a/test/Sema/types.c b/test/Sema/types.c
index dac0bfe9fe82207235f74dc89aae3ee6ef8441b2..0abd148ce176105643bcc2e3ee5554e8c9cd9a75 100644 (file)
--- a/test/Sema/types.c
+++ b/test/Sema/types.c
@@ -72,3 +72,4 @@ typedef int __attribute__ ((ext_vector_type(8192))) x2; // expected-error {{vect
 // no support for vector enum type
 enum { e_2 } x3 __attribute__((vector_size(64))); // expected-error {{invalid vector element type}}
 
+int x4 __attribute__((ext_vector_type(64)));  // expected-error {{'ext_vector_type' attribute only applies to types}}