зеркало из https://github.com/microsoft/clang-1.git
Pass all the locations of the selector identifiers for a message expression from the parser.
They are not kept in the AST yet. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140982 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Argyrios Kyrtzidis
Родитель
d2deee17ad
Коммит
951376242c
|
|
@ -570,7 +570,7 @@ public:
|
|||
bool IsInstanceSuper,
|
||||
QualType SuperType,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SelLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc);
|
||||
|
|
@ -605,7 +605,7 @@ public:
|
|||
SourceLocation LBracLoc,
|
||||
TypeSourceInfo *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SelLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc);
|
||||
|
|
@ -640,7 +640,7 @@ public:
|
|||
SourceLocation LBracLoc,
|
||||
Expr *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SeLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc);
|
||||
|
|
|
|||
|
|
@ -5270,7 +5270,7 @@ public:
|
|||
ExprResult ActOnSuperMessage(Scope *S, SourceLocation SuperLoc,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args);
|
||||
|
||||
|
|
@ -5280,7 +5280,7 @@ public:
|
|||
Selector Sel,
|
||||
ObjCMethodDecl *Method,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args);
|
||||
|
||||
|
|
@ -5288,7 +5288,7 @@ public:
|
|||
ParsedType Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args);
|
||||
|
||||
|
|
@ -5298,7 +5298,7 @@ public:
|
|||
Selector Sel,
|
||||
ObjCMethodDecl *Method,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args);
|
||||
|
||||
|
|
@ -5306,7 +5306,7 @@ public:
|
|||
Expr *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args);
|
||||
|
||||
|
|
|
|||
|
|
@ -2811,7 +2811,7 @@ ObjCMessageExpr *ObjCMessageExpr::Create(ASTContext &Context, QualType T,
|
|||
bool IsInstanceSuper,
|
||||
QualType SuperType,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SelLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc) {
|
||||
|
|
@ -2819,8 +2819,8 @@ ObjCMessageExpr *ObjCMessageExpr::Create(ASTContext &Context, QualType T,
|
|||
NumArgs * sizeof(Expr *);
|
||||
void *Mem = Context.Allocate(Size, llvm::AlignOf<ObjCMessageExpr>::Alignment);
|
||||
return new (Mem) ObjCMessageExpr(T, VK, LBracLoc, SuperLoc, IsInstanceSuper,
|
||||
SuperType, Sel, SelLoc, Method, Args,NumArgs,
|
||||
RBracLoc);
|
||||
SuperType, Sel, SelLocs.front(), Method,
|
||||
Args, NumArgs, RBracLoc);
|
||||
}
|
||||
|
||||
ObjCMessageExpr *ObjCMessageExpr::Create(ASTContext &Context, QualType T,
|
||||
|
|
@ -2828,14 +2828,15 @@ ObjCMessageExpr *ObjCMessageExpr::Create(ASTContext &Context, QualType T,
|
|||
SourceLocation LBracLoc,
|
||||
TypeSourceInfo *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SelLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc) {
|
||||
unsigned Size = sizeof(ObjCMessageExpr) + sizeof(void *) +
|
||||
NumArgs * sizeof(Expr *);
|
||||
void *Mem = Context.Allocate(Size, llvm::AlignOf<ObjCMessageExpr>::Alignment);
|
||||
return new (Mem) ObjCMessageExpr(T, VK, LBracLoc, Receiver, Sel, SelLoc,
|
||||
return new (Mem) ObjCMessageExpr(T, VK, LBracLoc, Receiver, Sel,
|
||||
SelLocs.front(),
|
||||
Method, Args, NumArgs, RBracLoc);
|
||||
}
|
||||
|
||||
|
|
@ -2844,14 +2845,15 @@ ObjCMessageExpr *ObjCMessageExpr::Create(ASTContext &Context, QualType T,
|
|||
SourceLocation LBracLoc,
|
||||
Expr *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation SelLoc,
|
||||
ArrayRef<SourceLocation> SelLocs,
|
||||
ObjCMethodDecl *Method,
|
||||
Expr **Args, unsigned NumArgs,
|
||||
SourceLocation RBracLoc) {
|
||||
unsigned Size = sizeof(ObjCMessageExpr) + sizeof(void *) +
|
||||
NumArgs * sizeof(Expr *);
|
||||
void *Mem = Context.Allocate(Size, llvm::AlignOf<ObjCMessageExpr>::Alignment);
|
||||
return new (Mem) ObjCMessageExpr(T, VK, LBracLoc, Receiver, Sel, SelLoc,
|
||||
return new (Mem) ObjCMessageExpr(T, VK, LBracLoc, Receiver, Sel,
|
||||
SelLocs.front(),
|
||||
Method, Args, NumArgs, RBracLoc);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2219,15 +2219,15 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
|
|||
SourceLocation Loc;
|
||||
IdentifierInfo *selIdent = ParseObjCSelectorPiece(Loc);
|
||||
|
||||
SourceLocation SelectorLoc = Loc;
|
||||
|
||||
SmallVector<IdentifierInfo *, 12> KeyIdents;
|
||||
SmallVector<SourceLocation, 12> KeyLocs;
|
||||
ExprVector KeyExprs(Actions);
|
||||
|
||||
if (Tok.is(tok::colon)) {
|
||||
while (1) {
|
||||
// Each iteration parses a single keyword argument.
|
||||
KeyIdents.push_back(selIdent);
|
||||
KeyLocs.push_back(Loc);
|
||||
|
||||
if (Tok.isNot(tok::colon)) {
|
||||
Diag(Tok, diag::err_expected_colon);
|
||||
|
|
@ -2342,24 +2342,26 @@ Parser::ParseObjCMessageExpressionBody(SourceLocation LBracLoc,
|
|||
SourceLocation RBracLoc = ConsumeBracket(); // consume ']'
|
||||
|
||||
unsigned nKeys = KeyIdents.size();
|
||||
if (nKeys == 0)
|
||||
if (nKeys == 0) {
|
||||
KeyIdents.push_back(selIdent);
|
||||
KeyLocs.push_back(Loc);
|
||||
}
|
||||
Selector Sel = PP.getSelectorTable().getSelector(nKeys, &KeyIdents[0]);
|
||||
|
||||
if (SuperLoc.isValid())
|
||||
return Actions.ActOnSuperMessage(getCurScope(), SuperLoc, Sel,
|
||||
LBracLoc, SelectorLoc, RBracLoc,
|
||||
LBracLoc, KeyLocs, RBracLoc,
|
||||
MultiExprArg(Actions,
|
||||
KeyExprs.take(),
|
||||
KeyExprs.size()));
|
||||
else if (ReceiverType)
|
||||
return Actions.ActOnClassMessage(getCurScope(), ReceiverType, Sel,
|
||||
LBracLoc, SelectorLoc, RBracLoc,
|
||||
LBracLoc, KeyLocs, RBracLoc,
|
||||
MultiExprArg(Actions,
|
||||
KeyExprs.take(),
|
||||
KeyExprs.size()));
|
||||
return Actions.ActOnInstanceMessage(getCurScope(), ReceiverExpr, Sel,
|
||||
LBracLoc, SelectorLoc, RBracLoc,
|
||||
LBracLoc, KeyLocs, RBracLoc,
|
||||
MultiExprArg(Actions,
|
||||
KeyExprs.take(),
|
||||
KeyExprs.size()));
|
||||
|
|
|
|||
|
|
@ -961,7 +961,7 @@ ExprResult Sema::ActOnSuperMessage(Scope *S,
|
|||
SourceLocation SuperLoc,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args) {
|
||||
// Determine whether we are inside a method or not.
|
||||
|
|
@ -1000,7 +1000,7 @@ ExprResult Sema::ActOnSuperMessage(Scope *S,
|
|||
SuperTy = Context.getObjCObjectPointerType(SuperTy);
|
||||
return BuildInstanceMessage(0, SuperTy, SuperLoc,
|
||||
Sel, /*Method=*/0,
|
||||
LBracLoc, SelectorLoc, RBracLoc, move(Args));
|
||||
LBracLoc, SelectorLocs, RBracLoc, move(Args));
|
||||
}
|
||||
|
||||
// Since we are in a class method, this is a class message to
|
||||
|
|
@ -1008,7 +1008,7 @@ ExprResult Sema::ActOnSuperMessage(Scope *S,
|
|||
return BuildClassMessage(/*ReceiverTypeInfo=*/0,
|
||||
Context.getObjCInterfaceType(Super),
|
||||
SuperLoc, Sel, /*Method=*/0,
|
||||
LBracLoc, SelectorLoc, RBracLoc, move(Args));
|
||||
LBracLoc, SelectorLocs, RBracLoc, move(Args));
|
||||
}
|
||||
|
||||
/// \brief Build an Objective-C class message expression.
|
||||
|
|
@ -1045,7 +1045,7 @@ ExprResult Sema::BuildClassMessage(TypeSourceInfo *ReceiverTypeInfo,
|
|||
Selector Sel,
|
||||
ObjCMethodDecl *Method,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg ArgsIn) {
|
||||
SourceLocation Loc = SuperLoc.isValid()? SuperLoc
|
||||
|
|
@ -1064,7 +1064,7 @@ ExprResult Sema::BuildClassMessage(TypeSourceInfo *ReceiverTypeInfo,
|
|||
assert(SuperLoc.isInvalid() && "Message to super with dependent type");
|
||||
return Owned(ObjCMessageExpr::Create(Context, ReceiverType,
|
||||
VK_RValue, LBracLoc, ReceiverTypeInfo,
|
||||
Sel, SelectorLoc, /*Method=*/0,
|
||||
Sel, SelectorLocs, /*Method=*/0,
|
||||
Args, NumArgs, RBracLoc));
|
||||
}
|
||||
|
||||
|
|
@ -1126,11 +1126,11 @@ ExprResult Sema::BuildClassMessage(TypeSourceInfo *ReceiverTypeInfo,
|
|||
if (SuperLoc.isValid())
|
||||
Result = ObjCMessageExpr::Create(Context, ReturnType, VK, LBracLoc,
|
||||
SuperLoc, /*IsInstanceSuper=*/false,
|
||||
ReceiverType, Sel, SelectorLoc,
|
||||
ReceiverType, Sel, SelectorLocs,
|
||||
Method, Args, NumArgs, RBracLoc);
|
||||
else
|
||||
Result = ObjCMessageExpr::Create(Context, ReturnType, VK, LBracLoc,
|
||||
ReceiverTypeInfo, Sel, SelectorLoc,
|
||||
ReceiverTypeInfo, Sel, SelectorLocs,
|
||||
Method, Args, NumArgs, RBracLoc);
|
||||
return MaybeBindToTemporary(Result);
|
||||
}
|
||||
|
|
@ -1142,7 +1142,7 @@ ExprResult Sema::ActOnClassMessage(Scope *S,
|
|||
ParsedType Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args) {
|
||||
TypeSourceInfo *ReceiverTypeInfo;
|
||||
|
|
@ -1156,7 +1156,7 @@ ExprResult Sema::ActOnClassMessage(Scope *S,
|
|||
|
||||
return BuildClassMessage(ReceiverTypeInfo, ReceiverType,
|
||||
/*SuperLoc=*/SourceLocation(), Sel, /*Method=*/0,
|
||||
LBracLoc, SelectorLoc, RBracLoc, move(Args));
|
||||
LBracLoc, SelectorLocs, RBracLoc, move(Args));
|
||||
}
|
||||
|
||||
/// \brief Build an Objective-C instance message expression.
|
||||
|
|
@ -1193,7 +1193,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
Selector Sel,
|
||||
ObjCMethodDecl *Method,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg ArgsIn) {
|
||||
// The location of the receiver.
|
||||
|
|
@ -1216,7 +1216,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
assert(SuperLoc.isInvalid() && "Message to super with dependent type");
|
||||
return Owned(ObjCMessageExpr::Create(Context, Context.DependentTy,
|
||||
VK_RValue, LBracLoc, Receiver, Sel,
|
||||
SelectorLoc, /*Method=*/0,
|
||||
SelectorLocs, /*Method=*/0,
|
||||
Args, NumArgs, RBracLoc));
|
||||
}
|
||||
|
||||
|
|
@ -1386,7 +1386,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
Sel,
|
||||
Method,
|
||||
LBracLoc,
|
||||
SelectorLoc,
|
||||
SelectorLocs,
|
||||
RBracLoc,
|
||||
move(ArgsIn));
|
||||
} else {
|
||||
|
|
@ -1416,6 +1416,8 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
diag::err_illegal_message_expr_incomplete_type))
|
||||
return ExprError();
|
||||
|
||||
SourceLocation SelLoc = SelectorLocs.front();
|
||||
|
||||
// In ARC, forbid the user from sending messages to
|
||||
// retain/release/autorelease/dealloc/retainCount explicitly.
|
||||
if (getLangOptions().ObjCAutoRefCount) {
|
||||
|
|
@ -1441,7 +1443,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
case OMF_autorelease:
|
||||
case OMF_retainCount:
|
||||
Diag(Loc, diag::err_arc_illegal_explicit_message)
|
||||
<< Sel << SelectorLoc;
|
||||
<< Sel << SelLoc;
|
||||
break;
|
||||
|
||||
case OMF_performSelector:
|
||||
|
|
@ -1467,7 +1469,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
// Issue error, unless ns_returns_not_retained.
|
||||
if (!SelMethod->hasAttr<NSReturnsNotRetainedAttr>()) {
|
||||
// selector names a +1 method
|
||||
Diag(SelectorLoc,
|
||||
Diag(SelLoc,
|
||||
diag::err_arc_perform_selector_retains);
|
||||
Diag(SelMethod->getLocation(), diag::note_method_declared_at);
|
||||
}
|
||||
|
|
@ -1476,7 +1478,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
// +0 call. OK. unless ns_returns_retained.
|
||||
if (SelMethod->hasAttr<NSReturnsRetainedAttr>()) {
|
||||
// selector names a +1 method
|
||||
Diag(SelectorLoc,
|
||||
Diag(SelLoc,
|
||||
diag::err_arc_perform_selector_retains);
|
||||
Diag(SelMethod->getLocation(), diag::note_method_declared_at);
|
||||
}
|
||||
|
|
@ -1485,7 +1487,7 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
}
|
||||
} else {
|
||||
// error (may leak).
|
||||
Diag(SelectorLoc, diag::warn_arc_perform_selector_leaks);
|
||||
Diag(SelLoc, diag::warn_arc_perform_selector_leaks);
|
||||
Diag(Args[0]->getExprLoc(), diag::note_used_here);
|
||||
}
|
||||
}
|
||||
|
|
@ -1498,11 +1500,11 @@ ExprResult Sema::BuildInstanceMessage(Expr *Receiver,
|
|||
if (SuperLoc.isValid())
|
||||
Result = ObjCMessageExpr::Create(Context, ReturnType, VK, LBracLoc,
|
||||
SuperLoc, /*IsInstanceSuper=*/true,
|
||||
ReceiverType, Sel, SelectorLoc, Method,
|
||||
ReceiverType, Sel, SelectorLocs, Method,
|
||||
Args, NumArgs, RBracLoc);
|
||||
else
|
||||
Result = ObjCMessageExpr::Create(Context, ReturnType, VK, LBracLoc,
|
||||
Receiver, Sel, SelectorLoc, Method,
|
||||
Receiver, Sel, SelectorLocs, Method,
|
||||
Args, NumArgs, RBracLoc);
|
||||
|
||||
if (getLangOptions().ObjCAutoRefCount) {
|
||||
|
|
@ -1535,7 +1537,7 @@ ExprResult Sema::ActOnInstanceMessage(Scope *S,
|
|||
Expr *Receiver,
|
||||
Selector Sel,
|
||||
SourceLocation LBracLoc,
|
||||
SourceLocation SelectorLoc,
|
||||
ArrayRef<SourceLocation> SelectorLocs,
|
||||
SourceLocation RBracLoc,
|
||||
MultiExprArg Args) {
|
||||
if (!Receiver)
|
||||
|
|
@ -1543,7 +1545,7 @@ ExprResult Sema::ActOnInstanceMessage(Scope *S,
|
|||
|
||||
return BuildInstanceMessage(Receiver, Receiver->getType(),
|
||||
/*SuperLoc=*/SourceLocation(), Sel, /*Method=*/0,
|
||||
LBracLoc, SelectorLoc, RBracLoc, move(Args));
|
||||
LBracLoc, SelectorLocs, RBracLoc, move(Args));
|
||||
}
|
||||
|
||||
enum ARCConversionTypeClass {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче