diff options
| -rw-r--r-- | lib/Parse/ParseExprCXX.cpp | 18 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 5 | ||||
| -rw-r--r-- | test/SemaCXX/member-pointers-2.cpp | 36 |
3 files changed, 58 insertions, 1 deletions
diff --git a/lib/Parse/ParseExprCXX.cpp b/lib/Parse/ParseExprCXX.cpp index a57d718d48..56484720db 100644 --- a/lib/Parse/ParseExprCXX.cpp +++ b/lib/Parse/ParseExprCXX.cpp @@ -326,6 +326,24 @@ Parser::OwningExprResult Parser::ParseCXXIdExpression(bool isAddressOfOperand) { /*ObjectType=*/0, Name)) return ExprError(); + + // This is only the direct operand of an & operator if it is not + // followed by a postfix-expression suffix. + if (isAddressOfOperand) { + switch (Tok.getKind()) { + case tok::l_square: + case tok::l_paren: + case tok::arrow: + case tok::period: + case tok::plusplus: + case tok::minusminus: + isAddressOfOperand = false; + break; + + default: + break; + } + } return Actions.ActOnIdExpression(CurScope, SS, Name, Tok.is(tok::l_paren), isAddressOfOperand); diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index f2ff6b6101..fd79935fbd 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -623,6 +623,9 @@ Sema::OwningExprResult Sema::ActOnIdExpression(Scope *S, UnqualifiedId &Name, bool HasTrailingLParen, bool IsAddressOfOperand) { + assert(!(IsAddressOfOperand && HasTrailingLParen) && + "cannot be direct & operand and have a trailing lparen"); + if (Name.getKind() == UnqualifiedId::IK_TemplateId) { ASTTemplateArgsPtr TemplateArgsPtr(*this, Name.TemplateId->getTemplateArgs(), @@ -856,7 +859,7 @@ Sema::ActOnDeclarationNameExpr(Scope *S, SourceLocation Loc, // performance. if (!ADL) { bool isAbstractMemberPointer = - (isAddressOfOperand && !HasTrailingLParen && SS && !SS->isEmpty()); + (isAddressOfOperand && SS && !SS->isEmpty()); if (!isAbstractMemberPointer && !Lookup.empty() && isa<CXXRecordDecl>((*Lookup.begin())->getDeclContext())) { diff --git a/test/SemaCXX/member-pointers-2.cpp b/test/SemaCXX/member-pointers-2.cpp new file mode 100644 index 0000000000..fea1d74b02 --- /dev/null +++ b/test/SemaCXX/member-pointers-2.cpp @@ -0,0 +1,36 @@ +// RUN: clang-cc -emit-llvm-only %s + +// Tests that Sema properly creates member-access expressions for +// these instead of bare FieldDecls. + +struct Foo { + int myvalue; + + // We have to override these to get something with an lvalue result. + int &operator++(int); + int &operator--(int); +}; + +struct Test0 { + Foo memfoo; + int memint; + int memarr[10]; + Test0 *memptr; + struct MemClass { int a; } memstruct; + int &memfun(); + + void test() { + int *p; + p = &Test0::memfoo++; + p = &Test0::memfoo--; + p = &Test0::memarr[1]; + p = &Test0::memptr->memint; + p = &Test0::memstruct.a; + p = &Test0::memfun(); + } +}; + +void test0() { + Test0 mytest; + mytest.test(); +} |