unit tests compile

Author: David Ungar

include/swift/AST/FineGrainedDependencies.h

@@ -800,6 +800,12 @@ class SourceFileDepGraph {
 
   static constexpr char noncascadingOrPrivatePrefix = '#';
 
+  static std::string noncascading(std::string name);
+
+  LLVM_ATTRIBUTE_UNUSED
+  static std::string privatize(std::string name);
+
+
   /// Nodes are owned by the graph.
   ~SourceFileDepGraph() {
     forEachNode([&](SourceFileDepGraphNode *n) { delete n; });

include/swift/Driver/FineGrainedDependencyDriverGraph.h

@@ -312,8 +312,10 @@ class ModuleDepGraph {
   }
 
   /// For unit tests.
-  ModuleDepGraph(const bool EnableTypeFingerprints = false)
+  ModuleDepGraph(const bool EnableTypeFingerprints)
       : ModuleDepGraph(true, false, EnableTypeFingerprints, false, nullptr) {}
+
+
   //============================================================================
   // MARK: ModuleDepGraph - updating from a switdeps file
   //============================================================================
@@ -330,6 +332,16 @@ class ModuleDepGraph {
   Changes loadFromSourceFileDepGraph(const driver::Job *cmd,
                                      const SourceFileDepGraph &);
 
+    /// Also for unit tests
+    Changes
+    simulateLoad(const driver::Job *cmd,
+                                llvm::StringMap<std::vector<std::string>> simpleNames,
+                                llvm::StringMap<std::vector<std::pair<std::string, std::string>>>
+                                compoundNames = {},
+                                const bool includePrivateDeps = false,
+                                const bool hadCompilationError = false);
+
+
 private:
   /// Read a SourceFileDepGraph belonging to \p job from \p buffer
   /// and integrate it into the ModuleDepGraph.
@@ -515,7 +527,7 @@ class ModuleDepGraph {
   void forEachUntracedJobDirectlyDependentOnExternalSwiftDeps(
       StringRef externalDependency, function_ref<void(const driver::Job *)> fn);
   //============================================================================
-  // MARK: ModuleDepGraph - verifyication
+  // MARK: ModuleDepGraph - verification
   //============================================================================
 
 private:
@@ -563,6 +575,9 @@ class ModuleDepGraph {
     assert(swiftDeps.empty() || getJob(swiftDeps));
     return true;
   }
+
+  static std::vector<const driver::Job *>
+  printJobsForDebugging(const std::vector<const driver::Job *> &jobs);
 };
 } // namespace fine_grained_dependencies
 } // namespace swift

lib/Driver/FineGrainedDependencyDriverGraph.cpp

@@ -38,6 +38,54 @@ using namespace swift;
 using namespace swift::fine_grained_dependencies;
 using namespace swift::driver;
 
+//==============================================================================
+// MARK: Affordances to unit tests
+//==============================================================================
+/// Initial underscore makes non-cascading, on member means private.
+ ModuleDepGraph::Changes
+ModuleDepGraph::simulateLoad(const Job *cmd,
+             llvm::StringMap<std::vector<std::string>> simpleNames,
+             llvm::StringMap<std::vector<std::pair<std::string, std::string>>>
+                 compoundNames,
+             const bool includePrivateDeps,
+             const bool hadCompilationError) {
+  StringRef swiftDeps =
+      cmd->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps);
+  assert(!swiftDeps.empty());
+  StringRef interfaceHash = swiftDeps;
+  auto sfdg = SourceFileDepGraph::simulateLoad(
+      swiftDeps, includePrivateDeps, hadCompilationError, interfaceHash,
+      simpleNames, compoundNames);
+
+  return loadFromSourceFileDepGraph(cmd, sfdg);
+}
+
+std::string SourceFileDepGraph::noncascading(std::string name) {
+  std::string s{SourceFileDepGraph::noncascadingOrPrivatePrefix};
+  s += name;
+  return s;
+}
+
+LLVM_ATTRIBUTE_UNUSED
+std::string SourceFileDepGraph::privatize(std::string name) {
+  std::string s{SourceFileDepGraph::noncascadingOrPrivatePrefix};
+  s += name;
+  return s;
+}
+
+LLVM_ATTRIBUTE_UNUSED
+std::vector<const Job *>
+ModuleDepGraph::printJobsForDebugging(const std::vector<const Job *> &jobs) {
+  llvm::errs() << "\nprintForDebugging: ";
+  for (auto *j : jobs) {
+    const auto swiftDeps =
+        j->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps);
+    assert(!swiftDeps.empty());
+    llvm::errs() << "job" << swiftDeps << ", ";
+  }
+  llvm::errs() << "\n";
+  return jobs;
+}
 //==============================================================================
 // MARK: Interfacing to Compilation
 //==============================================================================

unittests/Driver/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_swift_unittest(SwiftDriverTests
   CoarseGrainedDependencyGraphTests.cpp
   FineGrainedDependencyGraphTests.cpp
+  TypeBodyFingerprintsDependencyGraphTests.cpp
 )
 
 target_link_libraries(SwiftDriverTests