more SourceLocation lexicon change: instead of referring to the
"logical" location, refer to the "instantiation" location.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62316 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index 96295d0..0eb439a 100644
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -179,7 +179,7 @@
const SourceManager &SM) {
// If this comes from a macro expansion, we really do want the macro name, not
// the token this macro expanded to.
- Loc = SM.getLogicalLoc(Loc);
+ Loc = SM.getInstantiationLoc(Loc);
const char *StrData = SM.getCharacterData(Loc);
@@ -284,12 +284,12 @@
// spelling location.
SourceManager &SourceMgr = PP.getSourceManager();
- // Create a new SLoc which is expanded from logical(FileLoc) but whose
+ // Create a new SLoc which is expanded from Instantiation(FileLoc) but whose
// characters come from spelling(FileLoc)+Offset.
- SourceLocation VirtLoc = SourceMgr.getLogicalLoc(FileLoc);
+ SourceLocation InstLoc = SourceMgr.getInstantiationLoc(FileLoc);
SourceLocation SpellingLoc = SourceMgr.getSpellingLoc(FileLoc);
SpellingLoc = SourceLocation::getFileLoc(SpellingLoc.getFileID(), CharNo);
- return SourceMgr.getInstantiationLoc(SpellingLoc, VirtLoc);
+ return SourceMgr.getInstantiationLoc(SpellingLoc, InstLoc);
}
/// getSourceLocation - Return a source location identifier for the specified
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 81e44f4..6c4096d 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -244,7 +244,7 @@
Identifier.setFlagValue(Token::StartOfLine , isAtStartOfLine);
Identifier.setFlagValue(Token::LeadingSpace, hasLeadingSpace);
- // Update the tokens location to include both its logical and physical
+ // Update the tokens location to include both its instantiation and physical
// locations.
SourceLocation Loc =
SourceMgr.getInstantiationLoc(Identifier.getLocation(), InstantiateLoc);
@@ -453,7 +453,7 @@
// it will tokenize as a number (and not run into stuff after it in the temp
// buffer).
sprintf(TmpBuffer, "%u ",
- SourceMgr.getLogicalLineNumber(Tok.getLocation()));
+ SourceMgr.getInstantiationLineNumber(Tok.getLocation()));
unsigned Length = strlen(TmpBuffer)-1;
Tok.setKind(tok::numeric_constant);
Tok.setLength(Length);
@@ -470,7 +470,7 @@
}
// Escape this filename. Turn '\' -> '\\' '"' -> '\"'
- std::string FN = SourceMgr.getSourceName(SourceMgr.getLogicalLoc(Loc));
+ std::string FN =SourceMgr.getSourceName(SourceMgr.getInstantiationLoc(Loc));
FN = '"' + Lexer::Stringify(FN) + '"';
Tok.setKind(tok::string_literal);
Tok.setLength(FN.size());
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 59632ed..bbe0f5c 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -140,7 +140,7 @@
}
void Preprocessor::DumpLocation(SourceLocation Loc) const {
- SourceLocation LogLoc = SourceMgr.getLogicalLoc(Loc);
+ SourceLocation LogLoc = SourceMgr.getInstantiationLoc(Loc);
llvm::cerr << SourceMgr.getSourceName(LogLoc) << ':'
<< SourceMgr.getLineNumber(LogLoc) << ':'
<< SourceMgr.getColumnNumber(LogLoc);
@@ -314,7 +314,7 @@
// confusing.
if (CharNo == 0 || TokStart.isMacroID()) return TokStart;
- // Figure out how many physical characters away the specified logical
+ // Figure out how many physical characters away the specified instantiation
// character is. This needs to take into consideration newlines and
// trigraphs.
const char *TokPtr = SourceMgr.getCharacterData(TokStart);