From 7b183ffd3e099f59fd5b7e50756786c30cb85b51 Mon Sep 17 00:00:00 2001
From: Aaron Ballman <aaron@aaronballman.com>
Date: Wed, 16 Jul 2014 20:28:10 +0000
Subject: [PATCH] Specifying the diagnostic argument through the attribute
table generator instead of having to enter it manually as part of the
attribute subject list. This only affects attributes appertaining to ObjC
interfaces and protocols.
No new tests required as this is covered by existing tests.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213193 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/Attr.td | 9 ++++-----
utils/TableGen/ClangAttrEmitter.cpp | 2 ++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/include/clang/Basic/Attr.td b/include/clang/Basic/Attr.td
index 11ad93a06b3..640cd4dd40a 100644
--- a/include/clang/Basic/Attr.td
+++ b/include/clang/Basic/Attr.td
@@ -990,11 +990,10 @@ def ObjCDesignatedInitializer : Attr {
}
def ObjCRuntimeName : Attr {
- let Spellings = [GNU<"objc_runtime_name">];
- let Subjects = SubjectList<[ObjCInterface, ObjCProtocol], ErrorDiag,
- "ExpectedObjectiveCInterfaceOrProtocol">;
- let Args = [StringArgument<"MetadataName">];
- let Documentation = [ObjCRuntimeNameDocs];
+ let Spellings = [GNU<"objc_runtime_name">];
+ let Subjects = SubjectList<[ObjCInterface, ObjCProtocol], ErrorDiag>;
+ let Args = [StringArgument<"MetadataName">];
+ let Documentation = [ObjCRuntimeNameDocs];
}
def OptimizeNone : InheritableAttr {
diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp
index 7ae8b74765f..1790dcbd8d3 100644
--- a/utils/TableGen/ClangAttrEmitter.cpp
+++ b/utils/TableGen/ClangAttrEmitter.cpp
@@ -2154,6 +2154,8 @@ static std::string CalculateDiagnostic(const Record &S) {
"ExpectedVariableOrFunction)";
case ObjCMethod | ObjCProp: return "ExpectedMethodOrProperty";
+ case ObjCProtocol | ObjCInterface:
+ return "ExpectedObjectiveCInterfaceOrProtocol";
case Field | Var: return "ExpectedFieldOrGlobalVar";
}
--
GitLab