eliminate FullSourceLoc::getLocation() now that FullSourceLoc
*is* the location. This eliminates some weird X.getLocation().getLocation()'s.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62376 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Driver/HTMLDiagnostics.cpp b/lib/Driver/HTMLDiagnostics.cpp
index 7f20e1a..f335396 100644
--- a/lib/Driver/HTMLDiagnostics.cpp
+++ b/lib/Driver/HTMLDiagnostics.cpp
@@ -133,9 +133,9 @@
FullSourceLoc L = I->getLocation().getInstantiationLoc();
if (!FileIDInitialized) {
- FileID = SMgr.getCanonicalFileID(L.getLocation());
+ FileID = SMgr.getCanonicalFileID(L);
FileIDInitialized = true;
- } else if (SMgr.getCanonicalFileID(L.getLocation()) != FileID)
+ } else if (SMgr.getCanonicalFileID(L) != FileID)
return; // FIXME: Emit a warning?
// Check the source ranges.
@@ -339,11 +339,11 @@
SourceManager& SM = R.getSourceMgr();
FullSourceLoc LPos = Pos.getInstantiationLoc();
- unsigned FileID = SM.getCanonicalFileID(LPos.getLocation());
+ unsigned FileID = SM.getCanonicalFileID(LPos);
assert (&LPos.getManager() == &SM && "SourceManagers are different!");
- if (SM.getCanonicalFileID(LPos.getLocation()) != BugFileID)
+ if (SM.getCanonicalFileID(LPos) != BugFileID)
return;
const llvm::MemoryBuffer *Buf = SM.getBuffer(FileID);
@@ -351,7 +351,6 @@
// Compute the column number. Rewind from the current position to the start
// of the line.
-
unsigned ColNo = LPos.getColumnNumber();
const char *TokInstantiationPtr = LPos.getCharacterData();
const char *LineStart = TokInstantiationPtr-ColNo;