diff options
Diffstat (limited to 'lib/Basic')
| -rw-r--r-- | lib/Basic/SourceLocation.cpp | 4 | ||||
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp index f6c604b940..a13bbc5154 100644 --- a/lib/Basic/SourceLocation.cpp +++ b/lib/Basic/SourceLocation.cpp @@ -85,9 +85,9 @@ FullSourceLoc FullSourceLoc::getSpellingLoc() const { return FullSourceLoc(SrcMgr->getSpellingLoc(*this), *SrcMgr); } -unsigned FullSourceLoc::getInstantiationLineNumber(bool *Invalid) const { +unsigned FullSourceLoc::getExpansionLineNumber(bool *Invalid) const { assert(isValid()); - return SrcMgr->getInstantiationLineNumber(*this, Invalid); + return SrcMgr->getExpansionLineNumber(*this, Invalid); } unsigned FullSourceLoc::getExpansionColumnNumber(bool *Invalid) const { diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 2931961618..8f74e32ab2 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -1153,8 +1153,8 @@ unsigned SourceManager::getSpellingLineNumber(SourceLocation Loc, std::pair<FileID, unsigned> LocInfo = getDecomposedSpellingLoc(Loc); return getLineNumber(LocInfo.first, LocInfo.second); } -unsigned SourceManager::getInstantiationLineNumber(SourceLocation Loc, - bool *Invalid) const { +unsigned SourceManager::getExpansionLineNumber(SourceLocation Loc, + bool *Invalid) const { if (isInvalid(Loc, Invalid)) return 0; std::pair<FileID, unsigned> LocInfo = getDecomposedExpansionLoc(Loc); return getLineNumber(LocInfo.first, LocInfo.second); |