diff options
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 26 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/instantiate-function-1.mm | 14 |
2 files changed, 30 insertions, 10 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 77902d55130..6a0253823c0 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -2035,16 +2035,22 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc, diag::err_typecheck_member_reference_arrow) << BaseType << BaseExpr->getSourceRange()); } else { - // We use isTemplateTypeParmType directly here, instead of simply checking - // whether BaseType is dependent, because we want to report an error for - // - // T *t; - // t.foo; - // - // - if (BaseType->isTemplateTypeParmType()) - return Owned(new (Context) MemberExpr(BaseExpr, false, 0, - MemberLoc, Context.DependentTy)); + if (BaseType->isDependentType()) { + // Require that the base type isn't a pointer type + // (so we'll report an error for) + // T* t; + // t.f; + // + // In Obj-C++, however, the above expression is valid, since it could be + // accessing the 'f' property if T is an Obj-C interface. The extra check + // allows this, while still reporting an error if T is a struct pointer. + const PointerType *PT = BaseType->getAsPointerType(); + + if (!PT || (getLangOptions().ObjC1 && + !PT->getPointeeType()->isRecordType())) + return Owned(new (Context) MemberExpr(BaseExpr, false, 0, + MemberLoc, Context.DependentTy)); + } } // Handle field access to simple records. This also handles access to fields diff --git a/clang/test/SemaTemplate/instantiate-function-1.mm b/clang/test/SemaTemplate/instantiate-function-1.mm new file mode 100644 index 00000000000..aef2d9dbb7e --- /dev/null +++ b/clang/test/SemaTemplate/instantiate-function-1.mm @@ -0,0 +1,14 @@ +template<typename T> struct Member0 { + void f(T t) { + t; + t.f; + t->f; + + T* tp; + tp.f; + tp->f; + + this->f; + this.f; // expected-error{{member reference base type 'struct Member0 *const' is not a structure or union}} + } +}; |
