From 1569f95831a8c99e9f664137bf8f40e47ee3d90f Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 21 Apr 2010 20:38:13 +0000 Subject: [PATCH] Migrate the responsibility for turning the receiver name in an Objective-C class message expression into a type from the parser (which was doing so in two places) to Action::getObjCMessageKind() which, in the case of Sema, reduces the number of name lookups we need to perform. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102026 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Parse/Action.h | 12 +++++++----- lib/Parse/MinimalAction.cpp | 21 ++++++++++++++++++--- lib/Parse/ParseInit.cpp | 32 +++++++------------------------- lib/Parse/ParseObjc.cpp | 32 +++++++++----------------------- lib/Sema/Sema.h | 5 +++-- lib/Sema/SemaExprObjC.cpp | 31 ++++++++++++++++++++++--------- 6 files changed, 66 insertions(+), 67 deletions(-) diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h index 66ef8d0c67..c4ffa8be40 100644 --- a/include/clang/Parse/Action.h +++ b/include/clang/Parse/Action.h @@ -2373,9 +2373,7 @@ public: /// /// \param S The scope in which the message send occurs. /// - /// \param Name The identifier following the '['. This identifier - /// may be modified by the action, if, for example, typo-correction - /// finds a different class name. + /// \param Name The identifier following the '['. /// /// \param NameLoc The location of the identifier. /// @@ -2383,12 +2381,16 @@ public: /// /// \param HasTrailingDot Whether the name is followed by a period. /// + /// \param ReceiverType If this routine returns \c ObjCClassMessage, + /// this argument will be set to the receiver type. + /// /// \returns The kind of message send. virtual ObjCMessageKind getObjCMessageKind(Scope *S, - IdentifierInfo *&Name, + IdentifierInfo *Name, SourceLocation NameLoc, bool IsSuper, - bool HasTrailingDot); + bool HasTrailingDot, + TypeTy *&ReceiverType); /// \brief Parsed a message send to 'super'. /// diff --git a/lib/Parse/MinimalAction.cpp b/lib/Parse/MinimalAction.cpp index fc06a0d6a5..5a03767811 100644 --- a/lib/Parse/MinimalAction.cpp +++ b/lib/Parse/MinimalAction.cpp @@ -27,15 +27,30 @@ ActionBase::~ActionBase() {} Action::~Action() {} Action::ObjCMessageKind Action::getObjCMessageKind(Scope *S, - IdentifierInfo *&Name, + IdentifierInfo *Name, SourceLocation NameLoc, bool IsSuper, - bool HasTrailingDot) { + bool HasTrailingDot, + TypeTy *&ReceiverType) { + ReceiverType = 0; + if (IsSuper && !HasTrailingDot && S->isInObjcMethodScope()) return ObjCSuperMessage; - if (getTypeName(*Name, NameLoc, S)) + if (TypeTy *TyName = getTypeName(*Name, NameLoc, S)) { + DeclSpec DS; + const char *PrevSpec = 0; + unsigned DiagID = 0; + if (!DS.SetTypeSpecType(DeclSpec::TST_typename, NameLoc, PrevSpec, + DiagID, TyName)) { + DS.SetRangeEnd(NameLoc); + Declarator DeclaratorInfo(DS, Declarator::TypeNameContext); + TypeResult Ty = ActOnTypeName(S, DeclaratorInfo); + if (!Ty.isInvalid()) + ReceiverType = Ty.get(); + } return ObjCClassMessage; + } return ObjCInstanceMessage; } diff --git a/lib/Parse/ParseInit.cpp b/lib/Parse/ParseInit.cpp index b0735b3cab..1a2a226e68 100644 --- a/lib/Parse/ParseInit.cpp +++ b/lib/Parse/ParseInit.cpp @@ -130,15 +130,17 @@ Parser::OwningExprResult Parser::ParseInitializerWithPotentialDesignator() { if (getLang().ObjC1 && Tok.is(tok::identifier)) { IdentifierInfo *II = Tok.getIdentifierInfo(); SourceLocation IILoc = Tok.getLocation(); + TypeTy *ReceiverType; // Three cases. This is a message send to a type: [type foo] // This is a message send to super: [super foo] // This is a message sent to an expr: [super.bar foo] switch (Action::ObjCMessageKind Kind = Actions.getObjCMessageKind(CurScope, II, IILoc, II == Ident_super, - NextToken().is(tok::period))) { + NextToken().is(tok::period), + ReceiverType)) { case Action::ObjCSuperMessage: - case Action::ObjCClassMessage: { + case Action::ObjCClassMessage: // If we have exactly one array designator, this used the GNU // 'designation: array-designator' extension, otherwise there should be no // designators at all! @@ -154,36 +156,16 @@ Parser::OwningExprResult Parser::ParseInitializerWithPotentialDesignator() { ConsumeToken(), 0, ExprArg(Actions)); - - // FIXME: This code is redundant with ParseObjCMessageExpr. - // Create the type that corresponds to the identifier (which - // names an Objective-C class). - TypeTy *Type = 0; - if (TypeTy *TyName = Actions.getTypeName(*II, IILoc, CurScope)) { - DeclSpec DS; - const char *PrevSpec = 0; - unsigned DiagID = 0; - if (!DS.SetTypeSpecType(DeclSpec::TST_typename, IILoc, PrevSpec, - DiagID, TyName)) { - DS.SetRangeEnd(IILoc); - Declarator DeclaratorInfo(DS, Declarator::TypeNameContext); - TypeResult Ty = Actions.ActOnTypeName(CurScope, DeclaratorInfo); - if (!Ty.isInvalid()) - Type = Ty.get(); - } - } - - ConsumeToken(); // The identifier. - if (!Type) { + ConsumeToken(); // the identifier + if (!ReceiverType) { SkipUntil(tok::r_square); return ExprError(); } return ParseAssignmentExprWithObjCMessageExprStart(StartLoc, SourceLocation(), - Type, + ReceiverType, ExprArg(Actions)); - } case Action::ObjCInstanceMessage: // Fall through; we'll just parse the expression and diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 56937a66cd..2a71bf024b 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -1726,40 +1726,26 @@ Parser::OwningExprResult Parser::ParseObjCMessageExpression() { if (Tok.is(tok::identifier)) { IdentifierInfo *Name = Tok.getIdentifierInfo(); SourceLocation NameLoc = Tok.getLocation(); + TypeTy *ReceiverType; switch (Actions.getObjCMessageKind(CurScope, Name, NameLoc, Name == Ident_super, - NextToken().is(tok::period))) { + NextToken().is(tok::period), + ReceiverType)) { case Action::ObjCSuperMessage: return ParseObjCMessageExpressionBody(LBracLoc, ConsumeToken(), 0, ExprArg(Actions)); - case Action::ObjCClassMessage: { - // Create the type that corresponds to the identifier (which - // names an Objective-C class). - TypeTy *Type = 0; - if (TypeTy *TyName = Actions.getTypeName(*Name, NameLoc, CurScope)) { - DeclSpec DS; - const char *PrevSpec = 0; - unsigned DiagID = 0; - if (!DS.SetTypeSpecType(DeclSpec::TST_typename, NameLoc, PrevSpec, - DiagID, TyName)) { - DS.SetRangeEnd(NameLoc); - Declarator DeclaratorInfo(DS, Declarator::TypeNameContext); - TypeResult Ty = Actions.ActOnTypeName(CurScope, DeclaratorInfo); - if (!Ty.isInvalid()) - Type = Ty.get(); - } - } - - ConsumeToken(); // The identifier. - if (!Type) { + case Action::ObjCClassMessage: + if (!ReceiverType) { SkipUntil(tok::r_square); return ExprError(); } - return ParseObjCMessageExpressionBody(LBracLoc, SourceLocation(), Type, + ConsumeToken(); // the type name + + return ParseObjCMessageExpressionBody(LBracLoc, SourceLocation(), + ReceiverType, ExprArg(Actions)); - } case Action::ObjCInstanceMessage: // Fall through to parse an expression. diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index a7e402dfcb..a284803ed6 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -3867,10 +3867,11 @@ public: SourceLocation propertyNameLoc); virtual ObjCMessageKind getObjCMessageKind(Scope *S, - IdentifierInfo *&Name, + IdentifierInfo *Name, SourceLocation NameLoc, bool IsSuper, - bool HasTrailingDot); + bool HasTrailingDot, + TypeTy *&ReceiverType); virtual OwningExprResult ActOnSuperMessage(Scope *S, SourceLocation SuperLoc, Selector Sel, diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp index e9c391c3e9..3af0cfc2c4 100644 --- a/lib/Sema/SemaExprObjC.cpp +++ b/lib/Sema/SemaExprObjC.cpp @@ -503,10 +503,13 @@ ActOnClassPropertyRefExpr(IdentifierInfo &receiverName, } Sema::ObjCMessageKind Sema::getObjCMessageKind(Scope *S, - IdentifierInfo *&Name, + IdentifierInfo *Name, SourceLocation NameLoc, bool IsSuper, - bool HasTrailingDot) { + bool HasTrailingDot, + TypeTy *&ReceiverType) { + ReceiverType = 0; + // If the identifier is "super" and there is no trailing dot, we're // messaging super. if (IsSuper && !HasTrailingDot && S->isInObjcMethodScope()) @@ -541,11 +544,19 @@ Sema::ObjCMessageKind Sema::getObjCMessageKind(Scope *S, // We found something. If it's a type, then we have a class // message. Otherwise, it's an instance message. NamedDecl *ND = Result.getFoundDecl(); - if (isa(ND) || isa(ND) || - isa(ND)) - return ObjCClassMessage; - - return ObjCInstanceMessage; + QualType T; + if (ObjCInterfaceDecl *Class = dyn_cast(ND)) + T = Context.getObjCInterfaceType(Class); + else if (TypeDecl *Type = dyn_cast(ND)) + T = Context.getTypeDeclType(Type); + else + return ObjCInstanceMessage; + + // We have a class message, and T is the type we're + // messaging. Build source-location information for it. + TypeSourceInfo *TSInfo = Context.getTrivialTypeSourceInfo(T, NameLoc); + ReceiverType = CreateLocInfoType(T, TSInfo).getAsOpaquePtr(); + return ObjCClassMessage; } } @@ -561,7 +572,7 @@ Sema::ObjCMessageKind Sema::getObjCMessageKind(Scope *S, // If we found a declaration, correct when it refers to an Objective-C // class. NamedDecl *ND = Result.getFoundDecl(); - if (isa(ND)) { + if (ObjCInterfaceDecl *Class = dyn_cast(ND)) { Diag(NameLoc, diag::err_unknown_receiver_suggest) << Name << Result.getLookupName() << FixItHint::CreateReplacement(SourceRange(NameLoc), @@ -569,7 +580,9 @@ Sema::ObjCMessageKind Sema::getObjCMessageKind(Scope *S, Diag(ND->getLocation(), diag::note_previous_decl) << Corrected; - Name = ND->getIdentifier(); + QualType T = Context.getObjCInterfaceType(Class); + TypeSourceInfo *TSInfo = Context.getTrivialTypeSourceInfo(T, NameLoc); + ReceiverType = CreateLocInfoType(T, TSInfo).getAsOpaquePtr(); return ObjCClassMessage; } } else if (Result.empty() && Corrected.getAsIdentifierInfo() && -- 2.40.0