This is an archive of the discontinued LLVM Phabricator instance.

Differential D49100

Avoid returning an invalid end source loc
ClosedPublic

Authored by steveire on Jul 9 2018, 2:02 PM.

Details

Reviewers
rsmith

Diff Detail

Repository
rC Clang

Event Timeline

steveire created this revision.Jul 9 2018, 2:02 PM
Herald added a subscriber: cfe-commits. · View Herald TranscriptJul 9 2018, 2:02 PM
steveire edited the summary of this revision. (Show Details)Jul 10 2018, 4:16 PM
steveire updated this revision to Diff 157116.Jul 24 2018, 1:38 PM
steveire retitled this revision from Inline DeclarationNameInfo::getLocEnd into callers to Avoid returning an invalid end source loc.
steveire edited the summary of this revision. (Show Details)
rsmith accepted this revision.Jul 30 2018, 1:22 PM
This revision is now accepted and ready to land.Jul 30 2018, 1:22 PM
steveire closed this revision.Jul 30 2018, 1:47 PM

Committed in SVN revision 338301.

Revision Contents

PathSize
include/
clang/
AST/
6 lines
lib/
AST/
2 lines

Diff 157116

include/clang/AST/DeclarationName.h

Context not available.
SourceLocation getBeginLoc() const { return NameLoc; } SourceLocation getBeginLoc() const { return NameLoc; }
/// getEndLoc - Retrieve the location of the last token. /// getEndLoc - Retrieve the location of the last token.
SourceLocation getEndLoc() const; SourceLocation getEndLoc() const { return getLocEnd(); }
/// getSourceRange - The range of the declaration name. /// getSourceRange - The range of the declaration name.
SourceRange getSourceRange() const LLVM_READONLY { SourceRange getSourceRange() const LLVM_READONLY {
Context not available.
} }
SourceLocation getLocEnd() const LLVM_READONLY { SourceLocation getLocEnd() const LLVM_READONLY {
SourceLocation EndLoc = getEndLoc(); SourceLocation EndLoc = getEndLocPrivate();
return EndLoc.isValid() ? EndLoc : getLocStart(); return EndLoc.isValid() ? EndLoc : getLocStart();
} }
private:
SourceLocation getEndLocPrivate() const;
}; };
/// Insertion operator for diagnostics. This allows sending DeclarationName's /// Insertion operator for diagnostics. This allows sending DeclarationName's
Context not available.

lib/AST/DeclarationName.cpp

Context not available.
llvm_unreachable("Unexpected declaration name kind"); llvm_unreachable("Unexpected declaration name kind");
} }
SourceLocation DeclarationNameInfo::getEndLoc() const { SourceLocation DeclarationNameInfo::getEndLocPrivate() const {
switch (Name.getNameKind()) { switch (Name.getNameKind()) {
case DeclarationName::Identifier: case DeclarationName::Identifier:
case DeclarationName::CXXDeductionGuideName: case DeclarationName::CXXDeductionGuideName:
Context not available.