lower the interface to getLineNumber like we did for
getColumnNumber. This fixes a FIXME in
SourceManager::getPresumedLoc because we now just decompose
the sloc once.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63701 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index 2c764ad..370adc7 100644
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -162,7 +162,7 @@
}
Loc = SourceMgr.getInstantiationLoc(Loc);
- CurLine = SourceMgr.getLineNumber(Loc);
+ CurLine = SourceMgr.getInstantiationLineNumber(Loc);
if (DisableLineMarkers) return;
diff --git a/Driver/RewriteObjC.cpp b/Driver/RewriteObjC.cpp
index facb195..f860433 100644
--- a/Driver/RewriteObjC.cpp
+++ b/Driver/RewriteObjC.cpp
@@ -766,7 +766,8 @@
SourceLocation LocStart = Method->getLocStart();
SourceLocation LocEnd = Method->getLocEnd();
- if (SM->getLineNumber(LocEnd) > SM->getLineNumber(LocStart)) {
+ if (SM->getInstantiationLineNumber(LocEnd) >
+ SM->getInstantiationLineNumber(LocStart)) {
InsertText(LocStart, "#if 0\n", 6);
ReplaceText(LocEnd, 1, ";\n#endif\n", 9);
} else {
diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h
index 5c7ef1b..b752140 100644
--- a/include/clang/Basic/SourceLocation.h
+++ b/include/clang/Basic/SourceLocation.h
@@ -200,8 +200,6 @@
FullSourceLoc getInstantiationLoc() const;
FullSourceLoc getSpellingLoc() const;
- unsigned getLineNumber() const;
-
unsigned getInstantiationLineNumber() const;
unsigned getInstantiationColumnNumber() const;
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h
index 340c2e5..e0ed77f 100644
--- a/include/clang/Basic/SourceManager.h
+++ b/include/clang/Basic/SourceManager.h
@@ -490,14 +490,10 @@
/// for the position indicated. This requires building and caching a table of
/// line offsets for the MemoryBuffer, so this is not cheap: use only when
/// about to emit a diagnostic.
- unsigned getLineNumber(SourceLocation Loc) const;
+ unsigned getLineNumber(FileID FID, unsigned FilePos) const;
- unsigned getInstantiationLineNumber(SourceLocation Loc) const {
- return getLineNumber(getInstantiationLoc(Loc));
- }
- unsigned getSpellingLineNumber(SourceLocation Loc) const {
- return getLineNumber(getSpellingLoc(Loc));
- }
+ unsigned getInstantiationLineNumber(SourceLocation Loc) const;
+ unsigned getSpellingLineNumber(SourceLocation Loc) const;
// FIXME: This should handle #line.
SrcMgr::CharacteristicKind getFileCharacteristic(SourceLocation Loc) const {
diff --git a/lib/Basic/SourceLocation.cpp b/lib/Basic/SourceLocation.cpp
index 93f60fc..8e068d6 100644
--- a/lib/Basic/SourceLocation.cpp
+++ b/lib/Basic/SourceLocation.cpp
@@ -78,11 +78,6 @@
return FullSourceLoc(SrcMgr->getSpellingLoc(*this), *SrcMgr);
}
-unsigned FullSourceLoc::getLineNumber() const {
- assert(isValid());
- return SrcMgr->getLineNumber(*this);
-}
-
unsigned FullSourceLoc::getInstantiationLineNumber() const {
assert(isValid());
return SrcMgr->getInstantiationLineNumber(*this);
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 9d91deb..0e18416 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -474,11 +474,13 @@
}
unsigned SourceManager::getSpellingColumnNumber(SourceLocation Loc) const {
+ if (Loc.isInvalid()) return 0;
std::pair<FileID, unsigned> LocInfo = getDecomposedSpellingLoc(Loc);
return getColumnNumber(LocInfo.first, LocInfo.second);
}
unsigned SourceManager::getInstantiationColumnNumber(SourceLocation Loc) const {
+ if (Loc.isInvalid()) return 0;
std::pair<FileID, unsigned> LocInfo = getDecomposedInstantiationLoc(Loc);
return getColumnNumber(LocInfo.first, LocInfo.second);
}
@@ -535,17 +537,12 @@
/// for the position indicated. This requires building and caching a table of
/// line offsets for the MemoryBuffer, so this is not cheap: use only when
/// about to emit a diagnostic.
-unsigned SourceManager::getLineNumber(SourceLocation Loc) const {
- if (Loc.isInvalid()) return 0;
- assert(Loc.isFileID() && "Don't know what part of instantiation loc to get");
-
- std::pair<FileID, unsigned> LocInfo = getDecomposedLoc(Loc);
-
+unsigned SourceManager::getLineNumber(FileID FID, unsigned FilePos) const {
ContentCache *Content;
- if (LastLineNoFileIDQuery == LocInfo.first)
+ if (LastLineNoFileIDQuery == FID)
Content = LastLineNoContentCache;
else
- Content = const_cast<ContentCache*>(getSLocEntry(LocInfo.first)
+ Content = const_cast<ContentCache*>(getSLocEntry(FID)
.getFile().getContentCache());
// If this is the first use of line information for this buffer, compute the
@@ -559,12 +556,12 @@
unsigned *SourceLineCacheStart = SourceLineCache;
unsigned *SourceLineCacheEnd = SourceLineCache + Content->NumLines;
- unsigned QueriedFilePos = LocInfo.second+1;
+ unsigned QueriedFilePos = FilePos+1;
// If the previous query was to the same file, we know both the file pos from
// that query and the line number returned. This allows us to narrow the
// search space from the entire file to something near the match.
- if (LastLineNoFileIDQuery == LocInfo.first) {
+ if (LastLineNoFileIDQuery == FID) {
if (QueriedFilePos >= LastLineNoFilePos) {
SourceLineCache = SourceLineCache+LastLineNoResult-1;
@@ -618,13 +615,25 @@
= std::lower_bound(SourceLineCache, SourceLineCacheEnd, QueriedFilePos);
unsigned LineNo = Pos-SourceLineCacheStart;
- LastLineNoFileIDQuery = LocInfo.first;
+ LastLineNoFileIDQuery = FID;
LastLineNoContentCache = Content;
LastLineNoFilePos = QueriedFilePos;
LastLineNoResult = LineNo;
return LineNo;
}
+unsigned SourceManager::getInstantiationLineNumber(SourceLocation Loc) const {
+ if (Loc.isInvalid()) return 0;
+ std::pair<FileID, unsigned> LocInfo = getDecomposedInstantiationLoc(Loc);
+ return getLineNumber(LocInfo.first, LocInfo.second);
+}
+unsigned SourceManager::getSpellingLineNumber(SourceLocation Loc) const {
+ if (Loc.isInvalid()) return 0;
+ std::pair<FileID, unsigned> LocInfo = getDecomposedSpellingLoc(Loc);
+ return getLineNumber(LocInfo.first, LocInfo.second);
+}
+
+
/// getPresumedLoc - This method returns the "presumed" location of a
/// SourceLocation specifies. A "presumed location" can be modified by #line
/// or GNU line marker directives. This provides a view on the data that a
@@ -637,11 +646,8 @@
// Presumed locations are always for instantiation points.
std::pair<FileID, unsigned> LocInfo = getDecomposedInstantiationLoc(Loc);
- Loc = getInstantiationLoc(Loc);
-
- // FIXME: Could just decompose Loc once!
- const SrcMgr::FileInfo &FI = getSLocEntry(getFileID(Loc)).getFile();
+ const SrcMgr::FileInfo &FI = getSLocEntry(LocInfo.first).getFile();
const SrcMgr::ContentCache *C = FI.getContentCache();
// To get the source name, first consult the FileEntry (if one exists) before
@@ -649,7 +655,8 @@
const char *Filename =
C->Entry ? C->Entry->getName() : C->getBuffer()->getBufferIdentifier();
- return PresumedLoc(Filename, getLineNumber(Loc),
+ return PresumedLoc(Filename,
+ getLineNumber(LocInfo.first, LocInfo.second),
getColumnNumber(LocInfo.first, LocInfo.second),
FI.getIncludeLoc());
}
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 79abc34..bf1387a 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -455,7 +455,8 @@
// Don't bother if things are the same as last time.
SourceManager &SM = M->getContext().getSourceManager();
if (CurLoc == PrevLoc
- || (SM.getLineNumber(CurLoc) == SM.getLineNumber(PrevLoc)
+ || (SM.getInstantiationLineNumber(CurLoc) ==
+ SM.getInstantiationLineNumber(PrevLoc)
&& SM.isFromSameFile(CurLoc, PrevLoc)))
return;
diff --git a/lib/Driver/HTMLDiagnostics.cpp b/lib/Driver/HTMLDiagnostics.cpp
index 1e11905..1561fc4 100644
--- a/lib/Driver/HTMLDiagnostics.cpp
+++ b/lib/Driver/HTMLDiagnostics.cpp
@@ -461,10 +461,10 @@
SourceManager& SM = R.getSourceMgr();
SourceLocation InstantiationStart = SM.getInstantiationLoc(Range.getBegin());
- unsigned StartLineNo = SM.getLineNumber(InstantiationStart);
+ unsigned StartLineNo = SM.getInstantiationLineNumber(InstantiationStart);
SourceLocation InstantiationEnd = SM.getInstantiationLoc(Range.getEnd());
- unsigned EndLineNo = SM.getLineNumber(InstantiationEnd);
+ unsigned EndLineNo = SM.getInstantiationLineNumber(InstantiationEnd);
if (EndLineNo < StartLineNo)
return;
diff --git a/lib/Driver/TextDiagnosticPrinter.cpp b/lib/Driver/TextDiagnosticPrinter.cpp
index cf3733f..39367f0 100644
--- a/lib/Driver/TextDiagnosticPrinter.cpp
+++ b/lib/Driver/TextDiagnosticPrinter.cpp
@@ -45,11 +45,11 @@
SourceLocation Begin = SM.getInstantiationLoc(R.getBegin());
SourceLocation End = SM.getInstantiationLoc(R.getEnd());
- unsigned StartLineNo = SM.getLineNumber(Begin);
+ unsigned StartLineNo = SM.getInstantiationLineNumber(Begin);
if (StartLineNo > LineNo || SM.getFileID(Begin) != FID)
return; // No intersection.
- unsigned EndLineNo = SM.getLineNumber(End);
+ unsigned EndLineNo = SM.getInstantiationLineNumber(End);
if (EndLineNo < LineNo || SM.getFileID(End) != FID)
return; // No intersection.
@@ -167,7 +167,8 @@
// Highlight all of the characters covered by Ranges with ~ characters.
for (unsigned i = 0; i != Info.getNumRanges(); ++i)
- HighlightRange(Info.getRange(i), ILoc.getManager(), ILoc.getLineNumber(),
+ HighlightRange(Info.getRange(i), ILoc.getManager(),
+ ILoc.getInstantiationLineNumber(),
ILoc.getFileID(), CaretLine, SourceLine);
// Next, insert the caret itself.