intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-22 23:49:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

objectiveC: don't warn when in -Wselector mode and

Browse Source 
an unimplemented selector is consumed by
"respondsToSelector:". // rdar://12938616

llvm-svn: 173097
This commit is contained in:
Fariborz Jahanian
2013-01-21 22:32:29 +00:00
parent ce1ffcf8a2
commit 60ccb9b2a9
5 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Parse/Parser.h
View File

@@ -1410,7 +1410,8 @@ private:
ExprResult ParseObjCDictionaryLiteral(SourceLocation AtLoc);
ExprResult ParseObjCBoxedExpr(SourceLocation AtLoc);
ExprResult ParseObjCEncodeExpression(SourceLocation AtLoc);
ExprResult ParseObjCSelectorExpression(SourceLocation AtLoc);
ExprResult ParseObjCSelectorExpression(SourceLocation AtLoc,
bool WarnSelector=true);
ExprResult ParseObjCProtocolExpression(SourceLocation AtLoc);
bool isSimpleObjCMessageExpression();
ExprResult ParseObjCMessageExpression();

3
clang/include/clang/Sema/Sema.h
View File

@@ -4280,7 +4280,8 @@ public:
SourceLocation AtLoc,
SourceLocation SelLoc,
SourceLocation LParenLoc,
SourceLocation RParenLoc);
SourceLocation RParenLoc,
bool WarnSelector);
/// ParseObjCProtocolExpression - Build protocol expression for \@protocol
ExprResult ParseObjCProtocolExpression(IdentifierInfo * ProtocolName,

25
clang/lib/Parse/ParseObjc.cpp
View File

@@ -2425,6 +2425,8 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
ExprVector KeyExprs;
if (Tok.is(tok::colon)) {
bool RespondsToSelector =
selIdent && selIdent->isStr("respondsToSelector");
while (1) {
// Each iteration parses a single keyword argument.
KeyIdents.push_back(selIdent);
@@ -2463,7 +2465,22 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
return ExprError();
}
ExprResult Res(ParseAssignmentExpression());
ExprResult Res;
if (RespondsToSelector) {
if (Tok.is(tok::at)) {
// Special handling for 'respondsToSelector:' which must not warn
// on use of @selector expression as its sole argument.
Token AfterAt = GetLookAheadToken(1);
if (AfterAt.isObjCAtKeyword(tok::objc_selector)) {
SourceLocation AtLoc = ConsumeToken();
Res = ParseObjCSelectorExpression(AtLoc, false);
}
}
RespondsToSelector = false;
}
if (!Res.get())
Res = ParseAssignmentExpression();
if (Res.isInvalid()) {
// We must manually skip to a ']', otherwise the expression skipper will
// stop at the ']' when it skips to the ';'. We want it to skip beyond
@@ -2797,7 +2814,8 @@ Parser::ParseObjCProtocolExpression(SourceLocation AtLoc) {
/// objc-selector-expression
/// @selector '(' objc-keyword-selector ')'
ExprResult Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) {
ExprResult Parser::ParseObjCSelectorExpression(SourceLocation AtLoc,
bool WarnSelector) {
SourceLocation SelectorLoc = ConsumeToken();
if (Tok.isNot(tok::l_paren))
@@ -2855,7 +2873,8 @@ ExprResult Parser::ParseObjCSelectorExpression(SourceLocation AtLoc) {
Selector Sel = PP.getSelectorTable().getSelector(nColons, &KeyIdents[0]);
return Actions.ParseObjCSelectorExpression(Sel, AtLoc, SelectorLoc,
T.getOpenLocation(),
T.getCloseLocation());
T.getCloseLocation(),
WarnSelector);
}
void Parser::ParseLexedObjCMethodDefs(LexedMethod &LM, bool parseMethod) {

31
clang/lib/Sema/SemaExprObjC.cpp
View File

@@ -967,24 +967,27 @@ ExprResult Sema::ParseObjCSelectorExpression(Selector Sel,
SourceLocation AtLoc,
SourceLocation SelLoc,
SourceLocation LParenLoc,
SourceLocation RParenLoc) {
ObjCMethodDecl *Method = LookupInstanceMethodInGlobalPool(Sel,
SourceRange(LParenLoc, RParenLoc), false, false);
if (!Method)
Method = LookupFactoryMethodInGlobalPool(Sel,
SourceLocation RParenLoc,
bool WarnSelector) {
if (WarnSelector) {
ObjCMethodDecl *Method = LookupInstanceMethodInGlobalPool(Sel,
SourceRange(LParenLoc, RParenLoc), false, false);
if (!Method)
Method = LookupFactoryMethodInGlobalPool(Sel,
SourceRange(LParenLoc, RParenLoc));
if (!Method)
Diag(SelLoc, diag::warn_undeclared_selector) << Sel;
if (!Method)
Diag(SelLoc, diag::warn_undeclared_selector) << Sel;
if (!Method ||
Method->getImplementationControl() != ObjCMethodDecl::Optional) {
llvm::DenseMap<Selector, SourceLocation>::iterator Pos
= ReferencedSelectors.find(Sel);
if (Pos == ReferencedSelectors.end())
ReferencedSelectors.insert(std::make_pair(Sel, SelLoc));
if (!Method ||
Method->getImplementationControl() != ObjCMethodDecl::Optional) {
llvm::DenseMap<Selector, SourceLocation>::iterator Pos
= ReferencedSelectors.find(Sel);
if (Pos == ReferencedSelectors.end())
ReferencedSelectors.insert(std::make_pair(Sel, SelLoc));
}
}
// In ARC, forbid the user from using @selector for
// In ARC, forbid the user from using @selector for
// retain/release/autorelease/dealloc/retainCount.
if (getLangOpts().ObjCAutoRefCount) {
switch (Sel.getMethodFamily()) {

26
clang/test/SemaObjC/selector-3.m
View File

@@ -52,3 +52,29 @@ SEL func()
}
@end
// rdar://12938616
@class NSXPCConnection;
@interface NSObject
@end
@interface INTF : NSObject
{
NSXPCConnection *cnx; // Comes in as a parameter.
}
- (void) Meth;
@end
extern SEL MySelector(SEL s);
@implementation INTF
- (void) Meth {
if( [cnx respondsToSelector:MySelector(@selector( _setQueue: ))] ) // expected-warning {{unimplemented selector '_setQueue:'}}
{
}
if( [cnx respondsToSelector:@selector( _setQueueXX: )] ) // No warning here.
{
}
}
@end