Fixed range of implicit MemberExpr.

llvm-svn: 167581

2 files changed, 13 insertions, 2 deletions

diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp
index 61dd8bd5a6f..9dec1e8131d 100644
--- a/clang/lib/AST/Expr.cpp
+++ b/clang/lib/AST/Expr.cpp
@@ -1327,9 +1327,12 @@ SourceLocation MemberExpr::getLocStart() const {
   return MemberLoc;
 }
 SourceLocation MemberExpr::getLocEnd() const {
+  SourceLocation EndLoc = getMemberNameInfo().getEndLoc();
   if (hasExplicitTemplateArgs())
-    return getRAngleLoc();
-  return getMemberNameInfo().getEndLoc();
+    EndLoc = getRAngleLoc();
+  else if (EndLoc.isInvalid())
+    EndLoc = getBase()->getLocEnd();
+  return EndLoc;
 }
 
 void CastExpr::CheckCastConsistency() const {
diff --git a/clang/unittests/AST/SourceLocationTest.cpp b/clang/unittests/AST/SourceLocationTest.cpp
index 7d6e0c3dade..c1651bc586f 100644
--- a/clang/unittests/AST/SourceLocationTest.cpp
+++ b/clang/unittests/AST/SourceLocationTest.cpp
@@ -254,5 +254,13 @@ TEST(CXXNewExpr, ArrayRange) {
   EXPECT_TRUE(Verifier.match("void f() { new int[10]; }", newExpr()));
 }
 
+TEST(MemberExpr, ImplicitMemberRange) {
+  RangeVerifier<MemberExpr> Verifier;
+  Verifier.expectRange(2, 30, 2, 30);
+  EXPECT_TRUE(Verifier.match("struct S { operator int() const; };\n"
+                             "int foo(const S& s) { return s; }",
+                             memberExpr()));
+}
+
 } // end namespace ast_matchers
 } // end namespace clang