Changed declarations from Attr to InheritableAttr as they are already being processed...

Patch thanks to Dean Sutherland!  Reviewed by Eli Friedman.

llvm-svn: 186598

diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td
index cdb567d..8c820a0 100644 (file)
--- a/clang/include/clang/Basic/Attr.td
+++ b/clang/include/clang/Basic/Attr.td
@@ -169,13 +169,13 @@ def Aligned : InheritableAttr {
 
 def AlignMac68k : InheritableAttr {
   let Spellings = [];
-  let SemaHandler = 0;
-}
-
-def AllocSize : Attr {
-  let Spellings = [GNU<"alloc_size">, CXX11<"gnu", "alloc_size">];
-  let Args = [VariadicUnsignedArgument<"Args">];
-}
+  let SemaHandler = 0;\r
+}\r
+\r
+def AllocSize : InheritableAttr {\r
+  let Spellings = [GNU<"alloc_size">, CXX11<"gnu", "alloc_size">];\r
+  let Args = [VariadicUnsignedArgument<"Args">];\r
+}\r
 
 def AlwaysInline : InheritableAttr {
   let Spellings = [GNU<"always_inline">, CXX11<"gnu", "always_inline">];
@@ -323,17 +323,17 @@ def C11NoReturn : InheritableAttr {
 
 def CXX11NoReturn : InheritableAttr {
   let Spellings = [CXX11<"","noreturn">, CXX11<"std","noreturn">];
-  let Subjects = [Function];
-}
-
-def OpenCLKernel : Attr {
-  let Spellings = [Keyword<"__kernel">, Keyword<"kernel">];
-}
-
-def OpenCLImageAccess : Attr {
-  let Spellings = [GNU<"opencl_image_access">];
-  let Args = [IntArgument<"Access">];
-}
+  let Subjects = [Function];\r
+}\r
+\r
+def OpenCLKernel : InheritableAttr {\r
+  let Spellings = [Keyword<"__kernel">, Keyword<"kernel">];\r
+}\r
+\r
+def OpenCLImageAccess : Attr {\r
+  let Spellings = [GNU<"opencl_image_access">];\r
+  let Args = [IntArgument<"Access">];\r
+}\r
 
 def Deprecated : InheritableAttr {
   let Spellings = [GNU<"deprecated">, CXX11<"gnu", "deprecated">];
@@ -342,13 +342,13 @@ def Deprecated : InheritableAttr {
 
 def Destructor : InheritableAttr {
   let Spellings = [GNU<"destructor">, CXX11<"gnu", "destructor">];
-  let Args = [IntArgument<"Priority">];
-}
-
-def ExtVectorType : Attr {
-  let Spellings = [GNU<"ext_vector_type">];
-  let Args = [ExprArgument<"NumElements">];
-  let ASTNode = 0;
+  let Args = [IntArgument<"Priority">];\r
+}\r
+\r
+def ExtVectorType : Attr {\r
+  let Spellings = [GNU<"ext_vector_type">];\r
+  let Args = [ExprArgument<"NumElements">];\r
+  let ASTNode = 0;\r
 }
 
 def FallThrough : Attr {
@@ -435,13 +435,13 @@ def MBlazeSaveVolatiles : InheritableAttr {
 
 def Mips16 : InheritableAttr {
   let Spellings = [GNU<"mips16">, CXX11<"gnu", "mips16">];
-  let Subjects = [Function];
-}
-
-def Mode : Attr {
-  let Spellings = [GNU<"mode">, CXX11<"gnu", "mode">];
-  let Args = [IdentifierArgument<"Mode">];
-}
+  let Subjects = [Function];\r
+}\r
+\r
+def Mode : Attr {\r
+  let Spellings = [GNU<"mode">, CXX11<"gnu", "mode">];\r
+  let Args = [IdentifierArgument<"Mode">];\r
+}\r
 
 def Naked : InheritableAttr {
   let Spellings = [GNU<"naked">, CXX11<"gnu", "naked">];
@@ -554,28 +554,28 @@ def ObjCMethodFamily : InheritableAttr {
 }
 
 def ObjCNSObject : InheritableAttr {
-  let Spellings = [GNU<"NSObject">];
-}
-
-def ObjCPreciseLifetime : Attr {
-  let Spellings = [GNU<"objc_precise_lifetime">];
-  let Subjects = [Var];
-}
-
-def ObjCReturnsInnerPointer : Attr {
-  let Spellings = [GNU<"objc_returns_inner_pointer">];
-  let Subjects = [ObjCMethod];
-}
+  let Spellings = [GNU<"NSObject">];\r
+}\r
+\r
+def ObjCPreciseLifetime : InheritableAttr {\r
+  let Spellings = [GNU<"objc_precise_lifetime">];\r
+  let Subjects = [Var];\r
+}\r
+\r
+def ObjCReturnsInnerPointer : InheritableAttr {\r
+  let Spellings = [GNU<"objc_returns_inner_pointer">];\r
+  let Subjects = [ObjCMethod];\r
+}\r
 
 def ObjCRequiresSuper : InheritableAttr {
   let Spellings = [GNU<"objc_requires_super">];
-  let Subjects = [ObjCMethod];
-}
-
-def ObjCRootClass : Attr {
-  let Spellings = [GNU<"objc_root_class">];
-  let Subjects = [ObjCInterface];
-}
+  let Subjects = [ObjCMethod];\r
+}\r
+\r
+def ObjCRootClass : InheritableAttr {\r
+  let Spellings = [GNU<"objc_root_class">];\r
+  let Subjects = [ObjCInterface];\r
+}\r
 
 def Overloadable : Attr {
   let Spellings = [GNU<"overloadable">];
@@ -689,13 +689,13 @@ def ArcWeakrefUnavailable : InheritableAttr {
 def ObjCGC : Attr {
   let Spellings = [GNU<"objc_gc">];
   let Args = [IdentifierArgument<"Kind">];
-  let ASTNode = 0;
-}
-
-def ObjCOwnership : Attr {
-  let Spellings = [GNU<"objc_ownership">];
-  let Args = [IdentifierArgument<"Kind">];
-  let ASTNode = 0;
+  let ASTNode = 0;\r
+}\r
+\r
+def ObjCOwnership : InheritableAttr {\r
+  let Spellings = [GNU<"objc_ownership">];\r
+  let Args = [IdentifierArgument<"Kind">];\r
+  let ASTNode = 0;\r
 }
 
 def ObjCRequiresPropertyDefs : InheritableAttr {