Adjust the Registration of the Pseudo-Job for External Incremental Dependencies

Register the module the external dependencies ride in with the pseudo-job in the Driver. This is a hack.

Author: CodaFi

include/swift/Driver/FineGrainedDependencyDriverGraph.h

@@ -278,8 +278,6 @@ class ModuleDepGraph {
     assert(swiftDeps.hasValue() && "Don't call me for expats.");
     auto iter = jobsBySwiftDeps.find(swiftDeps.getValue());
     assert(iter != jobsBySwiftDeps.end() && "All jobs should be tracked.");
-    assert(getSwiftDeps(iter->second) == swiftDeps.getValue() &&
-           "jobsBySwiftDeps should be inverse of getSwiftDeps.");
     return iter->second;
   }
 

lib/Driver/Compilation.cpp

@@ -1161,10 +1161,6 @@ namespace driver {
           continue;
         }
 
-        // Is this module out of date? If not, just keep searching.
-        if (Comp.getLastBuildTime() >= depStatus.getLastModificationTime())
-          continue;
-
         // Can we run a cross-module incremental build at all? If not, fallback.
         if (!Comp.getEnableCrossModuleIncrementalBuild()) {
           fallbackToExternalBehavior(external);

lib/Driver/FineGrainedDependencyDriverGraph.cpp

@@ -120,7 +120,7 @@ ModuleDepGraph::Changes ModuleDepGraph::loadFromSwiftModuleBuffer(
       SourceFileDepGraph::loadFromSwiftModuleBuffer(buffer);
   if (!sourceFileDepGraph)
     return None;
-  registerJob(Cmd);
+  jobsBySwiftDeps.insert(std::make_pair(buffer.getBufferIdentifier(), Cmd));
   auto changes = integrate(*sourceFileDepGraph, buffer.getBufferIdentifier());
   if (verifyFineGrainedDependencyGraphAfterEveryImport)
     verify();
@@ -445,11 +445,11 @@ bool ModuleDepGraph::recordWhatUseDependsUpon(
           StringRef externalSwiftDeps = def->getKey().getName();
           if (def->getKey().getKind() == NodeKind::externalDepend) {
             externalDependencies.insert(externalSwiftDeps.str());
+            useHasNewExternalDependency = true;
           } else if (def->getKey().getKind() ==
                      NodeKind::incrementalExternalDepend) {
             incrementalExternalDependencies.insert(externalSwiftDeps.str());
           }
-          useHasNewExternalDependency = true;
         }
       });
   return useHasNewExternalDependency;