[cfe-commits] r67343 - in /cfe/trunk: include/clang/Lex/PTHManager.h lib/Lex/PTHLexer.cpp

[Ted Kremenek]

Author: kremenek
Date: Thu Mar 19 17:19:30 2009
New Revision: 67343

URL: http://llvm.org/viewvc/llvm-project?rev=67343&view=rev
Log:
Add PTHManager::getOriginalSourceFile(), a method that returns the name of the
original source file (if any) that was used to generate the PTH cache.

Modified:
    cfe/trunk/include/clang/Lex/PTHManager.h
    cfe/trunk/lib/Lex/PTHLexer.cpp

Modified: cfe/trunk/include/clang/Lex/PTHManager.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/PTHManager.h?rev=67343&r1=67342&r2=67343&view=diff

==============================================================================
--- cfe/trunk/include/clang/Lex/PTHManager.h (original)
+++ cfe/trunk/include/clang/Lex/PTHManager.h Thu Mar 19 17:19:30 2009
@@ -69,12 +69,16 @@
   ///  contains the cached spellings for literals.
   const unsigned char* const SpellingBase;
   
+  /// OriginalSourceFile - A null-terminated C-string that specifies the name
+  ///  if the file (if any) that was to used to generate the PTH cache.
+  const char* OriginalSourceFile;
+  
   /// This constructor is intended to only be called by the static 'Create'
   /// method.
   PTHManager(const llvm::MemoryBuffer* buf, void* fileLookup,
              const unsigned char* idDataTable, IdentifierInfo** perIDCache,
              void* stringIdLookup, unsigned numIds,
-             const unsigned char* spellingBase);
+             const unsigned char* spellingBase, const char *originalSourceFile);
 
   // Do not implement.
   PTHManager();
@@ -96,10 +100,16 @@
   
 public:
   // The current PTH version.
-  enum { Version = 8 };
+  enum { Version = 9 };
 
   ~PTHManager();
   
+  /// getOriginalSourceFile - Return the full path to the original header
+  ///  file name that was used to generate the PTH cache.
+  const char* getOriginalSourceFile() const {
+    return OriginalSourceFile;
+  }
+  
   /// get - Return the identifier token info for the specified named identifier.
   ///  Unlike the version in IdentifierTable, this returns a pointer instead
   ///  of a reference.  If the pointer is NULL then the IdentifierInfo cannot

Modified: cfe/trunk/lib/Lex/PTHLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PTHLexer.cpp?rev=67343&r1=67342&r2=67343&view=diff

==============================================================================
--- cfe/trunk/lib/Lex/PTHLexer.cpp (original)
+++ cfe/trunk/lib/Lex/PTHLexer.cpp Thu Mar 19 17:19:30 2009
@@ -569,10 +569,12 @@
                        const unsigned char* idDataTable,
                        IdentifierInfo** perIDCache, 
                        void* stringIdLookup, unsigned numIds,
-                       const unsigned char* spellingBase)
+                       const unsigned char* spellingBase,
+                       const char* originalSourceFile)
 : Buf(buf), PerIDCache(perIDCache), FileLookup(fileLookup),
   IdDataTable(idDataTable), StringIdLookup(stringIdLookup),
-  NumIds(numIds), PP(0), SpellingBase(spellingBase) {}
+  NumIds(numIds), PP(0), SpellingBase(spellingBase),
+  OriginalSourceFile(originalSourceFile) {}
 
 PTHManager::~PTHManager() {
   delete Buf;
@@ -701,10 +703,17 @@
     }
   }
 
+  // Compute the address of the original source file.
+  const unsigned char* originalSourceBase = PrologueOffset + sizeof(uint32_t)*4;
+  unsigned len = ReadUnalignedLE16(originalSourceBase);
+  if (!len) originalSourceBase = 0;  
+  
   // Create the new PTHManager.
   return new PTHManager(File.take(), FL.take(), IData, PerIDCache,
-                        SL.take(), NumIds, spellingBase);
+                        SL.take(), NumIds, spellingBase,
+                        (const char*) originalSourceBase);
 }
+
 IdentifierInfo* PTHManager::LazilyCreateIdentifierInfo(unsigned PersistentID) {
   // Look in the PTH file for the string data for the IdentifierInfo object.
   const unsigned char* TableEntry = IdDataTable + sizeof(uint32_t)*PersistentID;