зеркало из https://github.com/microsoft/clang-1.git
Selector: (changes made after discussing this more with Steve Naroff)
- Make Selector::getAsIdentifierInfo() private. Using IdentifierInfo* in Selector is an implementation detail that clients shouldn't think about. - Modify diagnostic emission in Sema::ProcessPropertyDecl to not use Selector::getAsIdentifierInfo() (which could crash when IdentifierInfo* is null) and instead use Selector::getAsString(). - Tidy up Selector::getAsString() implementation. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@66313 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Родитель
1fbfd5b9b8
Коммит
150ec292a6
|
@ -353,13 +353,6 @@ class Selector {
|
|||
assert((InfoPtr & ArgFlags) == 0 &&"Insufficiently aligned IdentifierInfo");
|
||||
}
|
||||
Selector(uintptr_t V) : InfoPtr(V) {}
|
||||
public:
|
||||
friend class SelectorTable; // only the SelectorTable can create these
|
||||
friend class DeclarationName; // and the AST's DeclarationName.
|
||||
|
||||
/// The default ctor should only be used when creating data structures that
|
||||
/// will contain selectors.
|
||||
Selector() : InfoPtr(0) {}
|
||||
|
||||
IdentifierInfo *getAsIdentifierInfo() const {
|
||||
if (getIdentifierInfoFlag())
|
||||
|
@ -369,6 +362,14 @@ public:
|
|||
unsigned getIdentifierInfoFlag() const {
|
||||
return InfoPtr & ArgFlags;
|
||||
}
|
||||
public:
|
||||
friend class SelectorTable; // only the SelectorTable can create these
|
||||
friend class DeclarationName; // and the AST's DeclarationName.
|
||||
|
||||
/// The default ctor should only be used when creating data structures that
|
||||
/// will contain selectors.
|
||||
Selector() : InfoPtr(0) {}
|
||||
|
||||
/// operator==/!= - Indicate whether the specified selectors are identical.
|
||||
bool operator==(Selector RHS) const {
|
||||
return InfoPtr == RHS.InfoPtr;
|
||||
|
|
|
@ -352,8 +352,9 @@ std::string Selector::getAsString() const {
|
|||
if (InfoPtr & ArgFlags) {
|
||||
IdentifierInfo *II = getAsIdentifierInfo();
|
||||
|
||||
// If the number of arguments is 0 then II is guaranteed to not be null.
|
||||
if (getNumArgs() == 0)
|
||||
return II ? II->getName() : "";
|
||||
return II->getName();
|
||||
|
||||
std::string Res = II ? II->getName() : "";
|
||||
Res += ":";
|
||||
|
|
|
@ -1139,7 +1139,7 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
|
|||
Diag(property->getLocation(),
|
||||
diag::err_accessor_property_type_mismatch)
|
||||
<< property->getDeclName()
|
||||
<< GetterMethod->getSelector().getAsIdentifierInfo();
|
||||
<< GetterMethod->getSelector().getAsString();
|
||||
Diag(GetterMethod->getLocation(), diag::note_declared_at);
|
||||
}
|
||||
|
||||
|
@ -1152,7 +1152,7 @@ void Sema::ProcessPropertyDecl(ObjCPropertyDecl *property,
|
|||
Diag(property->getLocation(),
|
||||
diag::err_accessor_property_type_mismatch)
|
||||
<< property->getDeclName()
|
||||
<< SetterMethod->getSelector().getAsIdentifierInfo();
|
||||
<< SetterMethod->getSelector().getAsString();
|
||||
Diag(SetterMethod->getLocation(), diag::note_declared_at);
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче