Add incrementalExternalDepend as an Incremental NodeKind

Author: CodaFi

include/swift/Basic/ReferenceDependencyKeys.h

@@ -53,15 +53,18 @@ enum class NodeKind {
   dynamicLookup,
   externalDepend,
   sourceFileProvide,
+  incrementalExternalDepend,
   /// For iterating through the NodeKinds.
   kindCount
 };
 
 /// Used for printing out NodeKinds to dot files, and dumping nodes for
 /// debugging.
 const std::string NodeKindNames[]{
-    "topLevel",      "nominal",        "potentialMember",  "member",
-    "dynamicLookup", "externalDepend", "sourceFileProvide"};
+    "topLevel",          "nominal",
+    "potentialMember",   "member",
+    "dynamicLookup",     "externalDepend",
+    "sourceFileProvide", "incrementalExternalDepend"};
 } // end namespace fine_grained_dependencies
 } // end namespace swift
 

lib/AST/FineGrainedDependencies.cpp

@@ -231,6 +231,7 @@ std::string DependencyKey::humanReadableName() const {
   switch (kind) {
   case NodeKind::member:
     return demangleTypeAsContext(context) + "." + name;
+  case NodeKind::incrementalExternalDepend:
   case NodeKind::externalDepend:
   case NodeKind::sourceFileProvide:
     return llvm::sys::path::filename(name).str();
@@ -261,9 +262,12 @@ raw_ostream &fine_grained_dependencies::operator<<(raw_ostream &out,
 bool DependencyKey::verify() const {
   assert((getKind() != NodeKind::externalDepend || isInterface()) &&
          "All external dependencies must be interfaces.");
+  assert((getKind() != NodeKind::incrementalExternalDepend || isInterface()) &&
+         "All incremental external dependencies must be interfaces.");
   switch (getKind()) {
   case NodeKind::topLevel:
   case NodeKind::dynamicLookup:
+  case NodeKind::incrementalExternalDepend:
   case NodeKind::externalDepend:
   case NodeKind::sourceFileProvide:
     assert(context.empty() && !name.empty() && "Must only have a name");
@@ -294,6 +298,7 @@ void DependencyKey::verifyNodeKindNames() {
       CHECK_NAME(potentialMember)
       CHECK_NAME(member)
       CHECK_NAME(dynamicLookup)
+      CHECK_NAME(incrementalExternalDepend)
       CHECK_NAME(externalDepend)
       CHECK_NAME(sourceFileProvide)
     case NodeKind::kindCount:

lib/AST/FrontendSourceFileDepGraphFactory.cpp

@@ -594,6 +594,9 @@ class UsedDeclEnumerator {
   }
 
   void enumerateExternalUses() {
+    for (StringRef s : depTracker.getIncrementalDependencies())
+      enumerateUse<NodeKind::incrementalExternalDepend>("", s);
+
     for (StringRef s : depTracker.getDependencies())
       enumerateUse<NodeKind::externalDepend>("", s);
   }

lib/FrontendTool/FrontendTool.cpp

@@ -2302,7 +2302,7 @@ static bool performCompileStepsPostSILGen(CompilerInstance &Instance,
       auto *Mod = MSF.get<ModuleDecl *>();
       fine_grained_dependencies::withReferenceDependencies(
           Mod, *Instance.getDependencyTracker(), Mod->getModuleFilename(),
-          alsoEmitDotFile, [](SourceFileDepGraph &&g) {
+          alsoEmitDotFile, [&](SourceFileDepGraph &&g) {
             serialize(MSF, serializationOpts, SM.get(), &g);
             return false;
           });

tools/swift-dependency-tool/swift-dependency-tool.cpp

@@ -93,6 +93,8 @@ void ScalarEnumerationTraits<swift::fine_grained_dependencies::NodeKind>::
   io.enumCase(value, "member", NodeKind::member);
   io.enumCase(value, "dynamicLookup", NodeKind::dynamicLookup);
   io.enumCase(value, "externalDepend", NodeKind::externalDepend);
+  io.enumCase(value, "incrementalExternalDepend",
+              NodeKind::incrementalExternalDepend);
   io.enumCase(value, "sourceFileProvide", NodeKind::sourceFileProvide);
 }
 

unittests/Driver/UnitTestSourceFileDepGraphFactory.cpp

@@ -147,6 +147,7 @@ UnitTestSourceFileDepGraphFactory::singleNameIsContext(const NodeKind kind) {
     return true;
   case NodeKind::topLevel:
   case NodeKind::dynamicLookup:
+  case NodeKind::incrementalExternalDepend:
   case NodeKind::externalDepend:
   case NodeKind::sourceFileProvide:
     return false;