maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename SourceManager::isBeforeInSourceLocationOffset -> isBeforeInSLocAddrSpace. 

llvm-svn: 138378
This commit is contained in:
Argyrios Kyrtzidis 2011-08-23 21:02:35 +00:00
parent 7a7ff681ee
commit 5451a3973b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/include/clang/Basic/SourceManager.h
View File

@ -1075,21 +1075,20 @@ public:
/// \brief Determines the order of 2 source locations in the "source location
/// address space".
bool isBeforeInSourceLocationOffset(SourceLocation LHS,
SourceLocation RHS) const {
return isBeforeInSourceLocationOffset(LHS, RHS.getOffset());
bool isBeforeInSLocAddrSpace(SourceLocation LHS, SourceLocation RHS) const {
return isBeforeInSLocAddrSpace(LHS, RHS.getOffset());
}
/// \brief Determines the order of a source location and a source location
/// offset in the "source location address space".
///
/// Note that we always consider source locations loaded from
bool isBeforeInSourceLocationOffset(SourceLocation LHS, unsigned RHS) const {
bool isBeforeInSLocAddrSpace(SourceLocation LHS, unsigned RHS) const {
unsigned LHSOffset = LHS.getOffset();
bool LHSLoaded = LHSOffset >= CurrentLoadedOffset;
bool RHSLoaded = RHS >= CurrentLoadedOffset;
if (LHSLoaded == RHSLoaded)
return LHS.getOffset() < RHS;
return LHSOffset < RHS;
return LHSLoaded;
}

3
clang/lib/Lex/TokenLexer.cpp
View File

@ -397,8 +397,7 @@ void TokenLexer::Lex(Token &Tok) {
// that captures all of this.
if (ExpandLocStart.isValid() && // Don't do this for token streams.
// Check that the token's location was not already set properly.
SM.isBeforeInSourceLocationOffset(Tok.getLocation(),
MacroStartSLocOffset)) {
SM.isBeforeInSLocAddrSpace(Tok.getLocation(), MacroStartSLocOffset)) {
SourceLocation instLoc;
if (Tok.is(tok::comment)) {
instLoc = SM.createExpansionLoc(Tok.getLocation(),