diff options
| -rw-r--r-- | lib/Sema/SemaExprMember.cpp | 4 | ||||
| -rw-r--r-- | test/SemaObjCXX/propert-dot-error.mm | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp index 5b37a6f022..918d28ff40 100644 --- a/lib/Sema/SemaExprMember.cpp +++ b/lib/Sema/SemaExprMember.cpp @@ -1045,7 +1045,7 @@ Sema::LookupMemberExpr(LookupResult &R, ExprResult &BaseExpr, // Handle ivar access to Objective-C objects. if (const ObjCObjectType *OTy = BaseType->getAs<ObjCObjectType>()) { - if (!SS.isEmpty()) { + if (!SS.isEmpty() && !SS.isInvalid()) { Diag(SS.getRange().getBegin(), diag::err_qualified_objc_access) << 1 << SS.getScopeRep() << FixItHint::CreateRemoval(SS.getRange()); @@ -1170,7 +1170,7 @@ Sema::LookupMemberExpr(LookupResult &R, ExprResult &BaseExpr, // Objective-C property access. const ObjCObjectPointerType *OPT; if (!IsArrow && (OPT = BaseType->getAs<ObjCObjectPointerType>())) { - if (!SS.isEmpty()) { + if (!SS.isEmpty() && !SS.isInvalid()) { Diag(SS.getRange().getBegin(), diag::err_qualified_objc_access) << 0 << SS.getScopeRep() << FixItHint::CreateRemoval(SS.getRange()); diff --git a/test/SemaObjCXX/propert-dot-error.mm b/test/SemaObjCXX/propert-dot-error.mm index b07c7e8cc2..747efeb536 100644 --- a/test/SemaObjCXX/propert-dot-error.mm +++ b/test/SemaObjCXX/propert-dot-error.mm @@ -64,4 +64,6 @@ class Forward; void testD(D *d) { d.Forward::property = 17; // expected-error{{property access cannot be qualified with 'Forward::'}} d->Forward::ivar = 12; // expected-error{{ivar access cannot be qualified with 'Forward::'}} + d.D::property = 17; // expected-error{{expected a class or namespace}} + d->D::ivar = 12; // expected-error{{expected a class or namespace}} } |