Avoid returning an invalid end source loc

[steveire]

Committed in SVN revision 338301.

include/clang/AST/DeclarationName.h

public:
   /// getBeginLoc - Retrieve the location of the first token.
   SourceLocation getBeginLoc() const { return NameLoc; }
 
   /// getEndLoc - Retrieve the location of the last token.
   SourceLocation getEndLoc() const;
 
   /// getSourceRange - The range of the declaration name.
   SourceRange getSourceRange() const LLVM_READONLY {
-    return SourceRange(getLocStart(), getLocEnd());
+    auto EndLoc = getEndLoc();
+    return SourceRange(getLocStart(), EndLoc.isValid() ? EndLoc : getLocStart());
   }
 
   SourceLocation getLocStart() const LLVM_READONLY {
     return getBeginLoc();
   }
-
-  SourceLocation getLocEnd() const LLVM_READONLY {
-    SourceLocation EndLoc = getEndLoc();
-    return EndLoc.isValid() ? EndLoc : getLocStart();
-  }
 };
 
 /// Insertion operator for diagnostics.  This allows sending DeclarationName's
 /// into a diagnostic with <<.
 inline const DiagnosticBuilder &operator<<(const DiagnosticBuilder &DB,
                                            DeclarationName N) {
   DB.AddTaggedVal(N.getAsOpaqueInteger(),
                   DiagnosticsEngine::ak_declarationname);

include/clang/AST/ExprCXX.h

SourceLocation getLocStart() const LLVM_READONLY {
     if (NestedNameSpecifierLoc l = getQualifierLoc())
       return l.getBeginLoc();
     return getNameInfo().getLocStart();
   }
 
   SourceLocation getLocEnd() const LLVM_READONLY {
     if (hasExplicitTemplateArgs())
       return getRAngleLoc();
-    return getNameInfo().getLocEnd();
+    auto nameInfo = getNameInfo();
+    auto endLoc = nameInfo.getEndLoc();
+    return endLoc.isValid() ? endLoc : nameInfo.getBeginLoc();
   }
 
   child_range children() {
     return child_range(child_iterator(), child_iterator());
   }
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == UnresolvedLookupExprClass;
SourceLocation getLocStart() const LLVM_READONLY {
     if (NestedNameSpecifierLoc l = getQualifierLoc())
       return l.getBeginLoc();
     return getMemberNameInfo().getLocStart();
   }
 
   SourceLocation getLocEnd() const LLVM_READONLY {
     if (hasExplicitTemplateArgs())
       return getRAngleLoc();
-    return getMemberNameInfo().getLocEnd();
+
+    auto nameInfo = getMemberNameInfo();
+    auto endLoc = nameInfo.getEndLoc();
+    return endLoc.isValid() ? endLoc : nameInfo.getBeginLoc();
   }
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == UnresolvedMemberExprClass;
   }
 
   // Iterators
   child_range children() {