Tweaks to shorten performCompile* a bit more.

# Conflicts:
#	lib/FrontendTool/FrontendTool.cpp

Author: davidungar

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/FrontendTool/FrontendTool.cpp

@@ -850,27 +850,25 @@ static bool performCompile(CompilerInstance &Instance,
   if (Action == FrontendOptions::ActionType::Parse)
     return Instance.getASTContext().hadError();
 
-  if (observer) {
+  if (observer)
     observer->performedSemanticAnalysis(Instance);
-  }
 
-  if (Stats) {
+  if (Stats)
     countStatsPostSema(*Stats, Instance);
-  }
 
-  FrontendOptions::DebugCrashMode CrashMode = opts.CrashMode;
-  if (CrashMode == FrontendOptions::DebugCrashMode::AssertAfterParse)
-    debugFailWithAssertion();
-  else if (CrashMode == FrontendOptions::DebugCrashMode::CrashAfterParse)
-    debugFailWithCrash();
+  {
+    FrontendOptions::DebugCrashMode CrashMode = opts.CrashMode;
+    if (CrashMode == FrontendOptions::DebugCrashMode::AssertAfterParse)
+      debugFailWithAssertion();
+    else if (CrashMode == FrontendOptions::DebugCrashMode::CrashAfterParse)
+      debugFailWithCrash();
+  }
 
   ASTContext &Context = Instance.getASTContext();
 
   verifyGenericSignaturesIfNeeded(Invocation, Context);
 
-  if (Invocation.getMigratorOptions().shouldRunMigrator()) {
-    migrator::updateCodeAndEmitRemap(&Instance, Invocation);
-  }
+  (void)migrator::updateCodeAndEmitRemapIfNeeded(&Instance, Invocation);
 
   if (Action == FrontendOptions::ActionType::REPL) {
     runREPL(Instance, ProcessCmdLine(Args.begin(), Args.end()),
@@ -913,6 +911,7 @@ static bool performCompile(CompilerInstance &Instance,
     if (!opts.ObjCHeaderOutputPath.empty())
       return printAsObjC(opts.ObjCHeaderOutputPath, Instance.getMainModule(),
                          opts.ImplicitObjCHeaderPath, moduleIsPublic);
+
     return emitIndexDataIfNeeded(Instance.getPrimarySourceFile(), Invocation,
                                  Instance) ||
            Context.hadError();
@@ -1037,15 +1036,16 @@ static void setPrivateDiscriminatorIfNeeded(IRGenOptions &IRGenOpts,
     IRGenOpts.DWARFDebugFlags += (" -private-discriminator " + PD.str()).str();
 }
 
-static bool serializeSIB(FrontendOptions &opts, SILModule *SM,
-                         ASTContext &Context, ModuleOrSourceFile MSF) {
+static bool serializeSIBIfNeeded(FrontendOptions &opts, SILModule *SM,
+                                 ASTContext &Context, ModuleOrSourceFile MSF) {
   const std::string &moduleOutputPath = opts.ModuleOutputPath;
   assert(!moduleOutputPath.empty() && "must have an output path");
 
   SerializationOptions serializationOpts;
   serializationOpts.OutputPath = moduleOutputPath.c_str();
   serializationOpts.SerializeAllSIL = true;
   serializationOpts.IsSIB = true;
+
   serialize(MSF, serializationOpts, SM);
   return Context.hadError();
 }
@@ -1166,12 +1166,11 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   SILOptions &SILOpts = Invocation.getSILOptions();
   IRGenOptions &IRGenOpts = Invocation.getIRGenOptions();
 
-  if (observer) {
+  if (observer)
     observer->performedSILGeneration(*SM);
-  }
-  if (Stats) {
+
+  if (Stats)
     countStatsPostSILGen(*Stats, *SM);
-  }
 
   // We've been told to emit SIL after SILGen, so write it now.
   if (Action == FrontendOptions::ActionType::EmitSILGen) {
@@ -1181,8 +1180,8 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
 
   if (Action == FrontendOptions::ActionType::EmitSIBGen) {
     linkAllIfNeeded(Invocation, SM.get());
-    serializeSIB(Invocation.getFrontendOptions(), SM.get(),
-                 Instance.getASTContext(), MSF);
+    serializeSIBIfNeeded(Invocation.getFrontendOptions(), SM.get(),
+                         Instance.getASTContext(), MSF);
     return Context.hadError();
   }
 
@@ -1222,22 +1221,18 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
 
   performSILOptimizations(Invocation, SM.get());
 
-  if (observer) {
+  if (observer)
     observer->performedSILOptimization(*SM);
-  }
-  if (Stats) {
+
+  if (Stats)
     countStatsPostSILOpt(*Stats, *SM);
-  }
 
   {
     SharedTimer timer("SIL verification, post-optimization");
     SM->verify();
   }
 
-  // Gather instruction counts if we are asked to do so.
-  if (SM->getOptions().PrintInstCounts) {
-    performSILInstCount(&*SM);
-  }
+  performSILInstCountIfNeeded(&*SM);
 
   setPrivateDiscriminatorIfNeeded(IRGenOpts, MSF);
 
@@ -1247,8 +1242,8 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   }
 
   if (Action == FrontendOptions::ActionType::EmitSIB)
-    return serializeSIB(Invocation.getFrontendOptions(), SM.get(),
-                        Instance.getASTContext(), MSF);
+    return serializeSIBIfNeeded(Invocation.getFrontendOptions(), SM.get(),
+                                Instance.getASTContext(), MSF);
 
   const bool haveModulePath =
       !opts.ModuleOutputPath.empty() || !opts.ModuleDocOutputPath.empty();
@@ -1280,7 +1275,6 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   if (Context.hadError())
     return true;
 
-  // Convert SIL to a lowered form suitable for IRGen.
   runSILLoweringPasses(*SM);
 
   // TODO: remove once the frontend understands what action it should perform
@@ -1307,9 +1301,8 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   // If the AST Context has no errors but no IRModule is available,
   // parallelIRGen happened correctly, since parallel IRGen produces multiple
   // modules.
-  if (!IRModule) {
+  if (!IRModule)
     return HadError;
-  }
 
   if (validateTBDIfNeeded(Invocation, MSF, astGuaranteedToCorrespondToSIL,
                           *IRModule))

lib/Migrator/Migrator.cpp

@@ -26,8 +26,11 @@
 using namespace swift;
 using namespace swift::migrator;
 
-bool migrator::updateCodeAndEmitRemap(CompilerInstance *Instance,
-                                      const CompilerInvocation &Invocation) {
+bool migrator::updateCodeAndEmitRemapIfNeeded(
+    CompilerInstance *Instance, const CompilerInvocation &Invocation) {
+  if (!Invocation.getMigratorOptions().shouldRunMigrator())
+    return false;
+
   // Delete the remap file, in case someone is re-running the Migrator. If the
   // file fails to compile and we don't get a chance to overwrite it, the old
   // changes may get picked up.

lib/SILOptimizer/UtilityPasses/InstCount.cpp

@@ -152,7 +152,9 @@ SILTransform *swift::createInstCount() {
   return new InstCount();
 }
 
-void swift::performSILInstCount(SILModule *M) {
+void swift::performSILInstCountIfNeeded(SILModule *M) {
+  if (!M->getOptions().PrintInstCounts)
+    return;
   SILPassManager PrinterPM(M);
   PrinterPM.executePassPipelinePlan(
       SILPassPipelinePlan::getInstCountPassPipeline());