Merge pull request #34224 from CodaFi/radical-incrementalism

Author: swift-ci

include/swift/Driver/Action.h

@@ -127,7 +127,7 @@ class JobAction : public Action {
   }
 };
 
-class CompileJobAction : public JobAction {
+class IncrementalJobAction : public JobAction {
 public:
   struct InputInfo {
     enum Status {
@@ -136,6 +136,8 @@ class CompileJobAction : public JobAction {
       NeedsNonCascadingBuild,
       NewlyAdded
     };
+
+  public:
     Status status = UpToDate;
     llvm::sys::TimePoint<> previousModTime;
 
@@ -153,18 +155,32 @@ class CompileJobAction : public JobAction {
   InputInfo inputInfo;
 
 public:
-  CompileJobAction(file_types::ID OutputType)
-      : JobAction(Action::Kind::CompileJob, None, OutputType),
-        inputInfo() {}
-
-  CompileJobAction(Action *Input, file_types::ID OutputType, InputInfo info)
-      : JobAction(Action::Kind::CompileJob, Input, OutputType),
-        inputInfo(info) {}
+  IncrementalJobAction(Kind Kind, ArrayRef<const Action *> Inputs,
+                       file_types::ID Type, InputInfo info)
+      : JobAction(Kind, Inputs, Type), inputInfo(info) {}
 
+public:
   InputInfo getInputInfo() const {
     return inputInfo;
   }
 
+public:
+  static bool classof(const Action *A) {
+    return A->getKind() == Action::Kind::CompileJob;
+  }
+};
+
+class CompileJobAction : public IncrementalJobAction {
+private:
+  virtual void anchor() override;
+
+public:
+  CompileJobAction(file_types::ID OutputType)
+      : IncrementalJobAction(Action::Kind::CompileJob, None, OutputType, {}) {}
+  CompileJobAction(Action *Input, file_types::ID OutputType, InputInfo info)
+      : IncrementalJobAction(Action::Kind::CompileJob, Input, OutputType,
+                             info) {}
+
   static bool classof(const Action *A) {
     return A->getKind() == Action::Kind::CompileJob;
   }

lib/Driver/Action.cpp

@@ -43,6 +43,8 @@ void InputAction::anchor() {}
 
 void JobAction::anchor() {}
 
+void IncrementalJobAction::anchor() {}
+
 void CompileJobAction::anchor() {}
 
 void InterpretJobAction::anchor() {}

lib/Driver/Compilation.cpp

@@ -860,7 +860,7 @@ namespace driver {
           computeFirstRoundCompileJobsForIncrementalCompilation();
 
       for (const Job *Cmd : Comp.getJobs()) {
-        if (Cmd->getFirstSwiftPrimaryInput().empty() ||
+        if (!isa<IncrementalJobAction>(Cmd->getSource()) ||
             compileJobsToSchedule.count(Cmd)) {
           scheduleCommandIfNecessaryAndPossible(Cmd);
           noteBuilding(Cmd, /*willBeBuilding*/ true, /*isTentative=*/false,
@@ -899,20 +899,22 @@ namespace driver {
     CommandSet
     computeDependenciesAndGetNeededCompileJobs(const bool forRanges) {
       auto getEveryCompileJob = [&] {
-        CommandSet everyCompileJob;
+        CommandSet everyIncrementalJob;
         for (const Job *Cmd : Comp.getJobs()) {
-          if (!Cmd->getFirstSwiftPrimaryInput().empty())
-            everyCompileJob.insert(Cmd);
+          if (isa<IncrementalJobAction>(Cmd->getSource()))
+            everyIncrementalJob.insert(Cmd);
         }
-        return everyCompileJob;
+        return everyIncrementalJob;
       };
 
       CommandSet jobsToSchedule;
       CommandSet initialCascadingCommands;
       for (const Job *cmd : Comp.getJobs()) {
-        const StringRef primary = cmd->getFirstSwiftPrimaryInput();
-        if (primary.empty())
-          continue; // not Compile
+        // Skip jobs that have no associated incremental info.
+        if (!isa<IncrementalJobAction>(cmd->getSource())) {
+          continue;
+        }
+
         const Optional<std::pair<bool, bool>> shouldSchedAndIsCascading =
             computeShouldInitiallyScheduleJobAndDependendents(cmd, forRanges);
         if (!shouldSchedAndIsCascading)