suck the call to "getSpellingLoc" that all clients do into
the implementation of PTHManager::getSpelling.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62408 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index b2870f4..fd7c367 100644
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -311,8 +311,9 @@
}
unsigned PTHManager::getSpelling(SourceLocation Loc, const char *&Buffer) {
- std::pair<FileID, unsigned> LocInfo =
- PP->getSourceManager().getDecomposedFileLoc(Loc);
+ SourceManager &SM = PP->getSourceManager();
+ Loc = SM.getSpellingLoc(Loc);
+ std::pair<FileID, unsigned> LocInfo = SM.getDecomposedFileLoc(Loc);
return getSpelling(LocInfo.first, LocInfo.second, Buffer);
}
diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp
index 976e1a2..ff84b0a 100644
--- a/lib/Lex/Preprocessor.cpp
+++ b/lib/Lex/Preprocessor.cpp
@@ -199,8 +199,7 @@
const char* TokStart;
if (PTH) {
- SourceLocation SLoc = SourceMgr.getSpellingLoc(Tok.getLocation());
- if (unsigned Len = PTH->getSpelling(SLoc, TokStart)) {
+ if (unsigned Len = PTH->getSpelling(Tok.getLocation(), TokStart)) {
assert(!Tok.needsCleaning());
return std::string(TokStart, TokStart+Len);
}
@@ -254,8 +253,7 @@
if (CurPTHLexer) {
Len = CurPTHLexer.get()->getSpelling(Tok.getLocation(), Buffer);
} else {
- Len = PTH->getSpelling(SourceMgr.getSpellingLoc(Tok.getLocation()),
- Buffer);
+ Len = PTH->getSpelling(Tok.getLocation(), Buffer);
}
// Did we find a spelling? If so return its length. Otherwise fall