From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Mon, 26 Jun 2017 20:15:21 +0000 (+0000)
Subject: Remove some redundant setup when preprocessing .pcm files.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2468c5d9d036f29b7dae03c6753e8474f5cffff;p=clang

Remove some redundant setup when preprocessing .pcm files.

Both of these steps are immediately overwritten by the FrontendAction setup.


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

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index fc4c6d3038..3936afab21 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -359,15 +359,6 @@ void SourceManager::initializeForReplay(const SourceManager &Old) {
     return Clone;
   };
 
-  // Set up our main file ID as a copy of the old source manager's main file.
-  const SLocEntry &OldMainFile = Old.getSLocEntry(Old.getMainFileID());
-  assert(OldMainFile.isFile() && "main file is macro expansion?");
-  auto *MainCC = CloneContentCache(OldMainFile.getFile().getContentCache());
-  MemBufferInfos.push_back(MainCC);
-  setMainFileID(createFileID(MainCC, SourceLocation(),
-                             OldMainFile.getFile().getFileCharacteristic(),
-                             0, 0));
-
   // Ensure all SLocEntries are loaded from the external source.
   for (unsigned I = 0, N = Old.LoadedSLocEntryTable.size(); I != N; ++I)
     if (!Old.SLocEntryLoaded[I])
diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp
index 7c0b854648..f81a06b318 100644
--- a/lib/Frontend/FrontendAction.cpp
+++ b/lib/Frontend/FrontendAction.cpp
@@ -561,7 +561,6 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
     CI.setFileManager(&AST->getFileManager());
     CI.createSourceManager(CI.getFileManager());
     CI.getSourceManager().initializeForReplay(AST->getSourceManager());
-    CI.createPreprocessor(getTranslationUnitKind());
 
     // Set up the input file for replay purposes.
     auto Kind = AST->getInputKind();