Pass the right SourceLocation to Actions.ActOnOverloadedOperatorReferenceExpr and Actions.ActOnConversionOperatorReferenceExpr. Update incomplete-call.cpp test.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84026 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index d10e38c..72e30e3 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/lib/Parse/ParseExpr.cpp
@@ -983,12 +983,14 @@
} else if (getLang().CPlusPlus && Tok.is(tok::kw_operator)) {
// We have a reference to a member operator, e.g., t.operator int or
// t.operator+.
+ SourceLocation OperatorLoc = Tok.getLocation();
+
if (OverloadedOperatorKind Op = TryParseOperatorFunctionId()) {
if (!LHS.isInvalid())
LHS = Actions.ActOnOverloadedOperatorReferenceExpr(CurScope,
move(LHS), OpLoc,
OpKind,
- Tok.getLocation(),
+ OperatorLoc,
Op, &SS);
// TryParseOperatorFunctionId already consumed our token, so
// don't bother
@@ -997,7 +999,7 @@
LHS = Actions.ActOnConversionOperatorReferenceExpr(CurScope,
move(LHS), OpLoc,
OpKind,
- Tok.getLocation(),
+ OperatorLoc,
ConvType, &SS);
} else {
// Don't emit a diagnostic; ParseConversionFunctionId does it for us
diff --git a/test/SemaCXX/incomplete-call.cpp b/test/SemaCXX/incomplete-call.cpp
index c61b61a..a9f49d2 100644
--- a/test/SemaCXX/incomplete-call.cpp
+++ b/test/SemaCXX/incomplete-call.cpp
@@ -1,10 +1,12 @@
// RUN: clang-cc -fsyntax-only -verify %s
-struct A; // expected-note 4 {{forward declaration of 'struct A'}}
+struct A; // expected-note 6 {{forward declaration of 'struct A'}}
A f(); // expected-note {{note: 'f' declared here}}
struct B {
A f(); // expected-note {{'f' declared here}}
+ A operator()(); // expected-note {{'operator()' declared here}}
+ operator A(); // expected-note {{'operator A' declared here}}
};
void g() {
@@ -17,4 +19,7 @@
B b;
b.f(); // expected-error {{calling 'f' with incomplete return type 'struct A'}}
+
+ b.operator()(); // expected-error {{calling 'operator()' with incomplete return type 'struct A'}}
+ b.operator A(); // expected-error {{calling 'operator A' with incomplete return type 'struct A'}}
}