Merge pull request #14349 from davidungar/PR-18-4b-refactor-performCompile

[Batch Mode] NFC: Carve up performCompile & performCompileStepsPostSILGen. (2)

Author: David Ungar

include/swift/Frontend/Frontend.h

@@ -521,9 +521,10 @@ class CompilerInstance {
                                 Optional<unsigned> BufferID);
 
 public:
-  /// Frees up the ASTContext and SILModule objects that this instance is
-  /// holding on.
-  void freeContextAndSIL();
+  void freeASTContext();
+
+  /// Frees up the SILModule that this instance is holding on to.
+  void freeSILModule();
 
 private:
   /// Load stdlib & return true if should continue, i.e. no error

include/swift/Frontend/FrontendInputsAndOutputs.h

@@ -104,6 +104,8 @@ class FrontendInputsAndOutputs {
 
   bool hasPrimaryInputs() const { return primaryInputCount() > 0; }
 
+  bool hasMultiplePrimaryInputs() const { return primaryInputCount() > 1; }
+
   /// Fails an assertion if there is more than one primary input.
   /// Used in situations where only one primary input can be handled
   /// and where batch mode has not been implemented yet.

include/swift/Frontend/FrontendOptions.h

@@ -282,6 +282,9 @@ class FrontendOptions {
   /// Indicates whether the action will immediately run code.
   static bool isActionImmediate(ActionType);
 
+  /// \return true if action only parses without doing other compilation steps.
+  static bool shouldActionOnlyParse(ActionType);
+
   /// Return a hash code of any components from these options that should
   /// contribute to a Swift Bridging PCH hash.
   llvm::hash_code getPCHHashComponents() const {

include/swift/Migrator/Migrator.h

@@ -25,10 +25,11 @@ class CompilerInstance;
 
 namespace migrator {
 
-/// Run the migrator on the compiler invocation's input file and emit a
-/// "replacement map" describing the requested changes to the source file.
-bool updateCodeAndEmitRemap(CompilerInstance *Instance,
-                            const CompilerInvocation &Invocation);
+/// If needed, run the migrator on the compiler invocation's input file and emit
+/// a "replacement map" describing the requested changes to the source file.
+/// \return true on error.
+bool updateCodeAndEmitRemapIfNeeded(CompilerInstance *Instance,
+                                    const CompilerInvocation &Invocation);
 
 struct Migrator {
   CompilerInstance *StartInstance;

include/swift/SILOptimizer/PassManager/Passes.h

@@ -65,8 +65,8 @@ namespace swift {
   /// \brief Convert SIL to a lowered form suitable for IRGen.
   void runSILLoweringPasses(SILModule &M);
 
-  /// \brief Perform SIL Inst Count on M.
-  void performSILInstCount(SILModule *M);
+  /// \brief Perform SIL Inst Count on M if needed.
+  void performSILInstCountIfNeeded(SILModule *M);
 
   /// \brief Identifiers for all passes. Used to procedurally create passes from
   /// lists of passes.

lib/Frontend/Frontend.cpp

@@ -813,12 +813,12 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals) {
          "Loaded a module during parse-only");
 }
 
-void CompilerInstance::freeContextAndSIL() {
+void CompilerInstance::freeASTContext() {
   Context.reset();
-  TheSILModule.reset();
   MainModule = nullptr;
   SML = nullptr;
   PrimaryBufferIDs.clear();
   PrimarySourceFiles.clear();
 }
 
+void CompilerInstance::freeSILModule() { TheSILModule.reset(); }

lib/Frontend/FrontendInputsAndOutputs.cpp

@@ -100,7 +100,7 @@ void FrontendInputsAndOutputs::forEachPrimaryInput(
 }
 
 void FrontendInputsAndOutputs::assertMustNotBeMoreThanOnePrimaryInput() const {
-  assert(primaryInputCount() < 2 &&
+  assert(!hasMultiplePrimaryInputs() &&
          "have not implemented >1 primary input yet");
 }
 

lib/Frontend/FrontendOptions.cpp

@@ -94,6 +94,19 @@ bool FrontendOptions::isActionImmediate(ActionType action) {
   llvm_unreachable("Unknown ActionType");
 }
 
+bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
+  switch (action) {
+  case FrontendOptions::ActionType::Parse:
+  case FrontendOptions::ActionType::DumpParse:
+  case FrontendOptions::ActionType::EmitSyntax:
+  case FrontendOptions::ActionType::DumpInterfaceHash:
+  case FrontendOptions::ActionType::EmitImportedModules:
+    return true;
+  default:
+    return false;
+  }
+}
+
 void FrontendOptions::forAllOutputPaths(
     const InputFile &input, std::function<void(const std::string &)> fn) const {
   if (RequestedAction != FrontendOptions::ActionType::EmitModuleOnly &&