[cfe-commits] r62494 - in /cfe/trunk: include/clang/Basic/SourceManager.h lib/Basic/SourceLocation.cpp lib/Basic/SourceManager.cpp

[Chris Lattner]

Author: lattner
Date: Mon Jan 19 01:30:29 2009
New Revision: 62494

URL: http://llvm.org/viewvc/llvm-project?rev=62494&view=rev
Log:
some minor cleanups to SourceManager, and eliminate the 
SourceManager::getBuffer(SourceLocation) method.

Modified:
    cfe/trunk/include/clang/Basic/SourceManager.h
    cfe/trunk/lib/Basic/SourceLocation.cpp
    cfe/trunk/lib/Basic/SourceManager.cpp

Modified: cfe/trunk/include/clang/Basic/SourceManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/SourceManager.h?rev=62494&r1=62493&r2=62494&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/SourceManager.h (original)
+++ cfe/trunk/include/clang/Basic/SourceManager.h Mon Jan 19 01:30:29 2009
@@ -286,7 +286,7 @@
   /// being #included from the specified IncludePosition.  This returns 0 on
   /// error and translates NULL into standard input.
   FileID createFileID(const FileEntry *SourceFile, SourceLocation IncludePos,
-                        SrcMgr::CharacteristicKind FileCharacter) {
+                      SrcMgr::CharacteristicKind FileCharacter) {
     const SrcMgr::ContentCache *IR = getContentCache(SourceFile);
     if (IR == 0) return FileID();    // Error opening file?
     return createFileID(IR, IncludePos, FileCharacter);
@@ -294,8 +294,7 @@
   
   /// createMainFileID - Create the FileID for the main source file.
   FileID createMainFileID(const FileEntry *SourceFile,
-                            SourceLocation IncludePos) {
-    
+                          SourceLocation IncludePos) {
     assert(MainFileID.isInvalid() && "MainFileID already set!");
     MainFileID = createFileID(SourceFile, IncludePos, SrcMgr::C_User);
     return MainFileID;
@@ -335,11 +334,6 @@
     return getContentCache(FID)->getBuffer();
   }
   
-  const llvm::MemoryBuffer *getBuffer(SourceLocation Loc) const {
-    return getContentCacheForLoc(Loc)->getBuffer();
-  }
-  
-  
   /// getBufferData - Return a pointer to the start and end of the character
   /// data for the specified FileID.
   std::pair<const char*, const char*> getBufferData(SourceLocation Loc) const;

Modified: cfe/trunk/lib/Basic/SourceLocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceLocation.cpp?rev=62494&r1=62493&r2=62494&view=diff

==============================================================================
--- cfe/trunk/lib/Basic/SourceLocation.cpp (original)
+++ cfe/trunk/lib/Basic/SourceLocation.cpp Mon Jan 19 01:30:29 2009
@@ -111,7 +111,7 @@
 
 const llvm::MemoryBuffer* FullSourceLoc::getBuffer() const {
   assert(isValid());
-  return SrcMgr->getBuffer(*this);
+  return SrcMgr->getBuffer(SrcMgr->getCanonicalFileID(*this));
 }
 
 void FullSourceLoc::dump() const {

Modified: cfe/trunk/lib/Basic/SourceManager.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/SourceManager.cpp?rev=62494&r1=62493&r2=62494&view=diff

==============================================================================
--- cfe/trunk/lib/Basic/SourceManager.cpp (original)
+++ cfe/trunk/lib/Basic/SourceManager.cpp Mon Jan 19 01:30:29 2009
@@ -184,7 +184,7 @@
 /// data for the specified location.
 std::pair<const char*, const char*> 
 SourceManager::getBufferData(SourceLocation Loc) const {
-  const llvm::MemoryBuffer *Buf = getBuffer(Loc);
+  const llvm::MemoryBuffer *Buf = getBuffer(getCanonicalFileID(Loc));
   return std::make_pair(Buf->getBufferStart(), Buf->getBufferEnd());
 }