Use PreprocessorLexer::getFileID() instead of Lexer::getFileLoc(). This is an interm...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59672 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp
index 68f495749973d7fc2a1c3704155cd8f541035e2f..42e44a593638ed4f4f331d68af0c5d1d1302a47f 100644 (file)
--- a/lib/Lex/PPDirectives.cpp
+++ b/lib/Lex/PPDirectives.cpp
@@ -692,7 +692,7 @@ void Preprocessor::HandleIncludeDirective(Token &IncludeTok,
   // header.
   SrcMgr::CharacteristicKind FileCharacter = 
     std::max(HeaderInfo.getFileDirFlavor(File),
-          SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileLoc()));
+          SourceMgr.getFileCharacteristic(getCurrentFileLexer()->getFileID()));
   
   // Look up the file, create a File ID for it.
   unsigned FileID = SourceMgr.createFileID(File, FilenameTok.getLocation(),

diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 53e1f8dc710ff5e6cb99795ffafed58b3cd7fa2f..24a9b41a38ae44c13d1295443bac26219d4de6c6 100644 (file)
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -513,7 +513,7 @@ void Preprocessor::ExpandBuiltinMacro(Token &Tok) {
     Lexer *TheLexer = getCurrentFileLexer();
     
     if (TheLexer)
-      CurFile = SourceMgr.getFileEntryForLoc(TheLexer->getFileLoc());
+      CurFile = SourceMgr.getFileEntryForID(TheLexer->getFileID());
     
     // If this file is older than the file it depends on, emit a diagnostic.
     const char *Result;

diff --git a/lib/Lex/Pragma.cpp b/lib/Lex/Pragma.cpp
index 0e0841da9a96e8d224f8952406254085b5fbf788..5e6de0ffc3c8130ad34c7adcd8aa8497d3616248 100644 (file)
--- a/lib/Lex/Pragma.cpp
+++ b/lib/Lex/Pragma.cpp
@@ -186,10 +186,10 @@ void Preprocessor::HandlePragmaOnce(Token &OnceTok) {
   }
   
   // Get the current file lexer we're looking at.  Ignore _Pragma 'files' etc.
-  SourceLocation FileLoc = getCurrentFileLexer()->getFileLoc();
+  unsigned FileID = getCurrentFileLexer()->getFileID();
   
   // Mark the file as a once-only file now.
-  HeaderInfo.MarkFileIncludeOnce(SourceMgr.getFileEntryForLoc(FileLoc));
+  HeaderInfo.MarkFileIncludeOnce(SourceMgr.getFileEntryForID(FileID));
 }
 
 void Preprocessor::HandlePragmaMark() {
@@ -251,7 +251,7 @@ void Preprocessor::HandlePragmaSystemHeader(Token &SysHeaderTok) {
   Lexer *TheLexer = getCurrentFileLexer();
   
   // Mark the file as a system header.
-  const FileEntry *File = SourceMgr.getFileEntryForLoc(TheLexer->getFileLoc());
+  const FileEntry *File = SourceMgr.getFileEntryForID(TheLexer->getFileID());
   HeaderInfo.MarkFileSystemHeader(File);
   
   // Notify the client, if desired, that we are in a new source file.
@@ -294,8 +294,8 @@ void Preprocessor::HandlePragmaDependency(Token &DependencyTok) {
     return;
   }
   
-  SourceLocation FileLoc = getCurrentFileLexer()->getFileLoc();
-  const FileEntry *CurFile = SourceMgr.getFileEntryForLoc(FileLoc);
+  unsigned FileID = getCurrentFileLexer()->getFileID();
+  const FileEntry *CurFile = SourceMgr.getFileEntryForID(FileID);
 
   // If this file is older than the file it depends on, emit a diagnostic.
   if (CurFile && CurFile->getModificationTime() < File->getModificationTime()) {