Teach Diagnostic about Selector.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66314 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/Diagnostic.h b/include/clang/Basic/Diagnostic.h
index 1bb294e..9dfcf3f 100644
--- a/include/clang/Basic/Diagnostic.h
+++ b/include/clang/Basic/Diagnostic.h
@@ -15,6 +15,7 @@
#define LLVM_CLANG_DIAGNOSTIC_H
#include "clang/Basic/SourceLocation.h"
+#include "clang/Basic/IdentifierTable.h"
#include <string>
#include <cassert>
@@ -26,7 +27,6 @@
class DiagnosticClient;
class SourceRange;
class DiagnosticBuilder;
- class IdentifierInfo;
// Import the diagnostic enums themselves.
namespace diag {
@@ -142,7 +142,8 @@
ak_identifierinfo, // IdentifierInfo
ak_qualtype, // QualType
ak_declarationname, // DeclarationName
- ak_nameddecl // NamedDecl *
+ ak_nameddecl, // NamedDecl *
+ ak_selector // Selector
};
private:
@@ -484,6 +485,13 @@
}
inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
+ Selector S) {
+ DB.AddTaggedVal(reinterpret_cast<intptr_t>(S.getAsOpaquePtr()),
+ Diagnostic::ak_selector);
+ return DB;
+}
+
+inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
const SourceRange &R) {
DB.AddSourceRange(R);
return DB;
@@ -566,6 +574,12 @@
return reinterpret_cast<IdentifierInfo*>(DiagObj->DiagArgumentsVal[Idx]);
}
+ /// getArgSelector - Return the specified Selector argument.
+ Selector getArgSelector(unsigned Idx) const {
+ assert(getArgKind(Idx) == Diagnostic::ak_selector &&
+ "invalid argument accessor!");
+ return Selector(DiagObj->DiagArgumentsVal[Idx]);
+ }
/// getRawArg - Return the specified non-string argument in an opaque form.
intptr_t getRawArg(unsigned Idx) const {
assert(getArgKind(Idx) != Diagnostic::ak_std_string &&
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 2584136..b6cee02 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -334,6 +334,8 @@
/// selectors that take no arguments and selectors that take 1 argument, which
/// accounts for 78% of all selectors in Cocoa.h.
class Selector {
+ friend class DiagnosticInfo;
+
enum IdentifierInfoFlag {
// MultiKeywordSelector = 0.
ZeroArg = 0x1,
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index 893eae5..84d4055 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -657,6 +657,14 @@
OutStr.push_back('\'');
break;
}
+ case Diagnostic::ak_selector: {
+ Selector S = getArgSelector(ArgNo);
+ OutStr.push_back('\'');
+ const std::string &s = S.getAsString();
+ OutStr.append(&s[0], &s[0]+s.length());
+ OutStr.push_back('\'');
+ break;
+ }
case Diagnostic::ak_qualtype:
case Diagnostic::ak_declarationname:
case Diagnostic::ak_nameddecl:
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index f91feb4..a265818 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1139,7 +1139,7 @@
Diag(property->getLocation(),
diag::err_accessor_property_type_mismatch)
<< property->getDeclName()
- << GetterMethod->getSelector().getAsString();
+ << GetterMethod->getSelector();
Diag(GetterMethod->getLocation(), diag::note_declared_at);
}
@@ -1152,7 +1152,7 @@
Diag(property->getLocation(),
diag::err_accessor_property_type_mismatch)
<< property->getDeclName()
- << SetterMethod->getSelector().getAsString();
+ << SetterMethod->getSelector();
Diag(SetterMethod->getLocation(), diag::note_declared_at);
}
}