A few small cleanups to r187504. Thanks to dblaikie for the assist.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@187521 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 78dce61..ee2eb6d 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -5102,14 +5102,13 @@
<< FixItHint::CreateReplacement(OpLoc, ".");
OpKind = tok::period;
break;
- } else {
- Diag(OpLoc, diag::err_typecheck_member_reference_arrow)
- << BaseType << Base->getSourceRange();
- CallExpr *CE = dyn_cast<CallExpr>(Base);
- if (Decl *CD = (CE ? CE->getCalleeDecl() : 0)) {
- Diag(CD->getLocStart(),
- diag::note_member_reference_arrow_from_operator_arrow);
- }
+ }
+ Diag(OpLoc, diag::err_typecheck_member_reference_arrow)
+ << BaseType << Base->getSourceRange();
+ CallExpr *CE = dyn_cast<CallExpr>(Base);
+ if (Decl *CD = (CE ? CE->getCalleeDecl() : 0)) {
+ Diag(CD->getLocStart(),
+ diag::note_member_reference_arrow_from_operator_arrow);
}
}
return ExprError();
diff --git a/test/FixIt/fixit.cpp b/test/FixIt/fixit.cpp
index 3bd5b57..52bbb38 100644
--- a/test/FixIt/fixit.cpp
+++ b/test/FixIt/fixit.cpp
@@ -326,3 +326,15 @@
return foo->(x) == y; // expected-error {{unexpected '->' in function call; perhaps remove the '->'?}}
}
}
+
+namespace PR15045 {
+ class Cl0 {
+ public:
+ int a;
+ };
+
+ int f() {
+ Cl0 c;
+ return c->a; // expected-error {{member reference type 'PR15045::Cl0' is not a pointer; maybe you meant to use '.'?}}
+ }
+}
diff --git a/test/SemaCXX/member-expr.cpp b/test/SemaCXX/member-expr.cpp
index e2462aa..cd8951f 100644
--- a/test/SemaCXX/member-expr.cpp
+++ b/test/SemaCXX/member-expr.cpp
@@ -79,9 +79,11 @@
};
void test0(int x) {
+ x.A::foo<int>(); // expected-error {{'int' is not a structure or union}}
}
void test1(A *x) {
+ x.A::foo<int>(); // expected-error {{'test5::A *' is a pointer}}
}
void test2(A &x) {