Merge pull request #31426 from slavapestov/index-before-silgen

Frontend: Write out index before SILGen

Author: slavapestov

lib/FrontendTool/FrontendTool.cpp

@@ -653,8 +653,7 @@ static void debugFailWithCrash() {
   LLVM_BUILTIN_TRAP;
 }
 
-/// \return true on error.
-static bool emitIndexDataIfNeeded(SourceFile *PrimarySourceFile,
+static void emitIndexDataIfNeeded(SourceFile *PrimarySourceFile,
                                   const CompilerInvocation &Invocation,
                                   const CompilerInstance &Instance);
 
@@ -1144,15 +1143,14 @@ static bool performCompileStepsPostSema(const CompilerInvocation &Invocation,
 }
 
 /// Emits index data for all primary inputs, or the main module.
-static bool
+static void
 emitIndexData(const CompilerInvocation &Invocation, const CompilerInstance &Instance) {
-  bool hadEmitIndexDataError = false;
   if (Instance.getPrimarySourceFiles().empty())
-    return emitIndexDataIfNeeded(nullptr, Invocation, Instance);
-  for (SourceFile *SF : Instance.getPrimarySourceFiles())
-    hadEmitIndexDataError = emitIndexDataIfNeeded(SF, Invocation, Instance) ||
-                            hadEmitIndexDataError;
-  return hadEmitIndexDataError;
+    emitIndexDataIfNeeded(nullptr, Invocation, Instance);
+  else {
+    for (SourceFile *SF : Instance.getPrimarySourceFiles())
+      emitIndexDataIfNeeded(SF, Invocation, Instance);
+  }
 }
 
 /// Emits all "one-per-module" supplementary outputs that don't depend on
@@ -1317,19 +1315,16 @@ static bool performCompile(CompilerInstance &Instance,
   emitSwiftRangesForAllPrimaryInputsIfNeeded(Invocation, Instance);
   emitCompiledSourceForAllPrimaryInputsIfNeeded(Invocation, Instance);
 
-  if (Context.hadError()) {
-    //  Emit the index store data even if there were compiler errors.
-    (void)emitIndexData(Invocation, Instance);
+  emitIndexData(Invocation, Instance);
+
+  if (Context.hadError())
     return true;
-  }
 
   (void)emitLoadedModuleTraceForAllPrimariesIfNeeded(
       Instance.getMainModule(), Instance.getDependencyTracker(), opts);
 
   // We've just been told to perform a typecheck, so we can return now.
   if (Action == FrontendOptions::ActionType::Typecheck) {
-    if (emitIndexData(Invocation, Instance))
-      return true;
     // FIXME: Whole-module outputs with a non-whole-module -typecheck ought to
     // be disallowed, but the driver implements -index-file mode by generating a
     // regular whole-module frontend command line and modifying it to index just
@@ -1641,17 +1636,10 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
   if (Action == FrontendOptions::ActionType::EmitSIB)
     return serializeSIB(SM.get(), PSPs, Context, MSF);
 
-  {
-    if (PSPs.haveModuleOrModuleDocOutputPaths()) {
-      if (Action == FrontendOptions::ActionType::MergeModules ||
-          Action == FrontendOptions::ActionType::EmitModuleOnly) {
-        // What if MSF is a module?
-        // emitIndexDataIfNeeded already handles that case;
-        // it'll index everything.
-        return emitIndexDataIfNeeded(MSF.dyn_cast<SourceFile *>(), Invocation,
-                                     Instance) ||
-               Context.hadError();
-      }
+  if (PSPs.haveModuleOrModuleDocOutputPaths()) {
+    if (Action == FrontendOptions::ActionType::MergeModules ||
+        Action == FrontendOptions::ActionType::EmitModuleOnly) {
+      return Context.hadError();
     }
   }
 
@@ -1703,11 +1691,6 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
       IRGenOpts, std::move(SM), PSPs, OutputFilename, MSF, HashGlobal,
       ParallelOutputFilenames, LinkerDirectives);
 
-  // Walk the AST for indexing after IR generation. Walking it before seems
-  // to cause miscompilation issues.
-  if (emitIndexDataIfNeeded(MSF.dyn_cast<SourceFile *>(), Invocation, Instance))
-    return true;
-
   // Just because we had an AST error it doesn't mean we can't performLLVM.
   bool HadError = Instance.getASTContext().hadError();
 
@@ -1726,13 +1709,13 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
          HadError;
 }
 
-static bool emitIndexDataIfNeeded(SourceFile *PrimarySourceFile,
+static void emitIndexDataIfNeeded(SourceFile *PrimarySourceFile,
                                   const CompilerInvocation &Invocation,
                                   const CompilerInstance &Instance) {
   const FrontendOptions &opts = Invocation.getFrontendOptions();
 
   if (opts.IndexStorePath.empty())
-    return false;
+    return;
 
   // FIXME: provide index unit token(s) explicitly and only use output file
   // paths as a fallback.
@@ -1753,29 +1736,23 @@ static bool emitIndexDataIfNeeded(SourceFile *PrimarySourceFile,
     const PrimarySpecificPaths &PSPs =
         opts.InputsAndOutputs.getPrimarySpecificPathsForPrimary(
             PrimarySourceFile->getFilename());
-    if (index::indexAndRecord(PrimarySourceFile, PSPs.OutputFilename,
-                              opts.IndexStorePath, opts.IndexSystemModules,
-                              opts.IndexIgnoreStdlib, isDebugCompilation,
-                              Invocation.getTargetTriple(),
-                              *Instance.getDependencyTracker())) {
-      return true;
-    }
+    (void) index::indexAndRecord(PrimarySourceFile, PSPs.OutputFilename,
+                                 opts.IndexStorePath, opts.IndexSystemModules,
+                                 opts.IndexIgnoreStdlib, isDebugCompilation,
+                                 Invocation.getTargetTriple(),
+                                 *Instance.getDependencyTracker());
   } else {
     std::string moduleToken =
         Invocation.getModuleOutputPathForAtMostOnePrimary();
     if (moduleToken.empty())
       moduleToken = opts.InputsAndOutputs.getSingleOutputFilename();
 
-    if (index::indexAndRecord(Instance.getMainModule(), opts.InputsAndOutputs.copyOutputFilenames(),
-                              moduleToken, opts.IndexStorePath,
-                              opts.IndexSystemModules, opts.IndexIgnoreStdlib,
-                              isDebugCompilation, Invocation.getTargetTriple(),
-                              *Instance.getDependencyTracker())) {
-      return true;
-    }
+    (void) index::indexAndRecord(Instance.getMainModule(), opts.InputsAndOutputs.copyOutputFilenames(),
+                                 moduleToken, opts.IndexStorePath,
+                                 opts.IndexSystemModules, opts.IndexIgnoreStdlib,
+                                 isDebugCompilation, Invocation.getTargetTriple(),
+                                 *Instance.getDependencyTracker());
   }
-
-  return false;
 }
 
 /// Returns true if an error occurred.