Include Incremental Dependencies in Module Trace

Author: CodaFi

lib/Frontend/ModuleInterfaceBuilder.cpp

@@ -79,10 +79,13 @@ bool ModuleInterfaceBuilder::collectDepsForSerialization(
   path::native(ResourcePath);
 
   auto DTDeps = SubInstance.getDependencyTracker()->getDependencies();
-  SmallVector<StringRef, 16> InitialDepNames(DTDeps.begin(), DTDeps.end());
-  InitialDepNames.push_back(interfacePath);
-  InitialDepNames.insert(InitialDepNames.end(),
-                         extraDependencies.begin(), extraDependencies.end());
+  SmallVector<std::string, 16> InitialDepNames(DTDeps.begin(), DTDeps.end());
+  auto IncDeps = SubInstance.getDependencyTracker()->getIncrementalDependencyPaths();
+  InitialDepNames.append(IncDeps.begin(), IncDeps.end());
+  InitialDepNames.push_back(interfacePath.str());
+  for (const auto &extra : extraDependencies) {
+    InitialDepNames.push_back(extra.str());
+  }
   SmallString<128> Scratch;
 
   for (const auto &InitialDepName : InitialDepNames) {

lib/FrontendTool/LoadedModuleTrace.cpp

@@ -577,7 +577,11 @@ static void computeSwiftModuleTraceInfo(
     path::replace_extension(modPath, swiftInterfaceExt);
   };
 
-  for (auto &depPath : depTracker.getDependencies()) {
+  auto deps = depTracker.getDependencies();
+  SmallVector<std::string, 16> dependencies{deps.begin(), deps.end()};
+  auto incrDeps = depTracker.getIncrementalDependencyPaths();
+  dependencies.append(incrDeps.begin(), incrDeps.end());
+  for (const auto &depPath : dependencies) {
 
     // Decide if this is a swiftmodule based on the extension of the raw
     // dependency path, as the true file may have a different one.