[cfe-commits] r62374 - in /cfe/trunk: include/clang/Basic/SourceLocation.h lib/Basic/SourceLocation.cpp lib/Driver/HTMLDiagnostics.cpp
Chris Lattner
sabre at nondot.org
Fri Jan 16 14:59:51 PST 2009
Author: lattner
Date: Fri Jan 16 16:59:51 2009
New Revision: 62374
URL: http://llvm.org/viewvc/llvm-project?rev=62374&view=rev
Log:
elimiante FullSourceLoc::getCanonicalFileID
Modified:
cfe/trunk/include/clang/Basic/SourceLocation.h
cfe/trunk/lib/Basic/SourceLocation.cpp
cfe/trunk/lib/Driver/HTMLDiagnostics.cpp
Modified: cfe/trunk/include/clang/Basic/SourceLocation.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceLocation.h?rev=62374&r1=62373&r2=62374&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/SourceLocation.h (original)
+++ cfe/trunk/include/clang/Basic/SourceLocation.h Fri Jan 16 16:59:51 2009
@@ -258,8 +258,6 @@
bool isInSystemHeader() const;
- unsigned getCanonicalFileID() const;
-
bool operator==(const FullSourceLoc& RHS) const {
return SrcMgr == RHS.SrcMgr && Loc == RHS.Loc;
}
Modified: cfe/trunk/lib/Basic/SourceLocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceLocation.cpp?rev=62374&r1=62373&r2=62374&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/SourceLocation.cpp (original)
+++ cfe/trunk/lib/Basic/SourceLocation.cpp Fri Jan 16 16:59:51 2009
@@ -98,9 +98,8 @@
return SrcMgr->isInSystemHeader(Loc);
}
-
-const char * FullSourceLoc::getCharacterData() const {
- assert (isValid());
+const char *FullSourceLoc::getCharacterData() const {
+ assert(isValid());
return SrcMgr->getCharacterData(Loc);
}
@@ -109,10 +108,6 @@
return SrcMgr->getBuffer(Loc.getFileID());
}
-unsigned FullSourceLoc::getCanonicalFileID() const {
- return SrcMgr->getCanonicalFileID(Loc);
-}
-
void FullSourceLoc::dump() const {
if (!isValid()) {
fprintf(stderr, "Invalid Loc\n");
Modified: cfe/trunk/lib/Driver/HTMLDiagnostics.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/HTMLDiagnostics.cpp?rev=62374&r1=62373&r2=62374&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/HTMLDiagnostics.cpp (original)
+++ cfe/trunk/lib/Driver/HTMLDiagnostics.cpp Fri Jan 16 16:59:51 2009
@@ -124,8 +124,7 @@
if (noDir)
return;
- SourceManager& SMgr = D.begin()->getLocation().getManager();
-
+ SourceManager &SMgr = D.begin()->getLocation().getManager();
unsigned FileID = 0;
bool FileIDInitialized = false;
@@ -134,10 +133,9 @@
FullSourceLoc L = I->getLocation().getInstantiationLoc();
if (!FileIDInitialized) {
- FileID = L.getCanonicalFileID();
+ FileID = SMgr.getCanonicalFileID(L.getLocation());
FileIDInitialized = true;
- }
- else if (L.getCanonicalFileID() != FileID)
+ } else if (SMgr.getCanonicalFileID(L.getLocation()) != FileID)
return; // FIXME: Emit a warning?
// Check the source ranges.
@@ -345,7 +343,7 @@
assert (&LPos.getManager() == &SM && "SourceManagers are different!");
- if (LPos.getCanonicalFileID() != BugFileID)
+ if (SM.getCanonicalFileID(LPos.getLocation()) != BugFileID)
return;
const llvm::MemoryBuffer *Buf = SM.getBuffer(FileID);
More information about the cfe-commits
mailing list