Migrate Driver Unit Tests to Fingerprints

Author: CodaFi

lib/Driver/Driver.cpp

@@ -547,10 +547,7 @@ populateOutOfDateMap(InputInfoMap &map, llvm::sys::TimePoint<> &LastBuildTime,
       // -swift-version argument is handled in the argsHashStr check that
       // follows.
       CompilationRecordSwiftVersion = value->getValue(scratch);
-      versionValid = (CompilationRecordSwiftVersion
-                      == version::getSwiftFullVersion(
-                        version::Version::getCurrentLanguageVersion()));
-
+      versionValid = CompilationRecordSwiftVersion.equals(version::getSwiftFullVersion(version::Version::getCurrentLanguageVersion()));
     } else if (keyStr == compilation_record::getName(TopLevelKey::Options)) {
       auto *value = dyn_cast<yaml::ScalarNode>(i->getValue());
       if (!value)

unittests/Driver/FineGrainedDependencyGraphTests.cpp

@@ -788,7 +788,8 @@ TEST(ModuleDepGraph, BaselineForPrintsAndCrossType) {
 
   {
     const auto jobs = simulateReload(
-        graph, &job0, {{NodeKind::nominal, {"A1", "A2"}}}, "changed");
+        graph, &job0, {{NodeKind::nominal, {"A1", "A2"}}},
+        Fingerprint{"chchchangesturnandfacethestrange"});
     EXPECT_EQ(3u, jobs.size());
     EXPECT_TRUE(contains(jobs, &job0));
     EXPECT_TRUE(contains(jobs, &job1));

unittests/Driver/MockingFineGrainedDependencyGraphs.cpp

@@ -26,7 +26,7 @@ using namespace mocking_fine_grained_dependency_graphs;
 void mocking_fine_grained_dependency_graphs::simulateLoad(
     ModuleDepGraph &g, const driver::Job *cmd,
     const DependencyDescriptions &dependencyDescriptions,
-    StringRef interfaceHashIfNonEmpty,
+    Optional<Fingerprint> interfaceHashIfNonEmpty,
     const bool hadCompilationError) {
   const auto changes = getChangesForSimulatedLoad(
       g, cmd, dependencyDescriptions, interfaceHashIfNonEmpty,
@@ -38,13 +38,14 @@ ModuleDepGraph::Changes
 mocking_fine_grained_dependency_graphs::getChangesForSimulatedLoad(
     ModuleDepGraph &g, const driver::Job *cmd,
     const DependencyDescriptions &dependencyDescriptions,
-    StringRef interfaceHashIfNonEmpty,
+    Optional<Fingerprint> interfaceHashIfNonEmpty,
     const bool hadCompilationError) {
-  StringRef swiftDeps =
-      cmd->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps);
+  auto swiftDeps =
+    cmd->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps).str();
   assert(!swiftDeps.empty());
-  StringRef interfaceHash =
-      interfaceHashIfNonEmpty.empty() ? swiftDeps : interfaceHashIfNonEmpty;
+  swiftDeps.resize(Fingerprint::DIGEST_LENGTH, 'X');
+  auto interfaceHash =
+    interfaceHashIfNonEmpty.getValueOr(Fingerprint{swiftDeps});
 
   SourceManager sm;
   DiagnosticEngine diags(sm);
@@ -63,7 +64,7 @@ std::vector<const driver::Job *>
 mocking_fine_grained_dependency_graphs::simulateReload(
     ModuleDepGraph &g, const driver::Job *cmd,
     const DependencyDescriptions &dependencyDescriptions,
-    StringRef interfaceHashIfNonEmpty,
+    Optional<Fingerprint> interfaceHashIfNonEmpty,
     const bool hadCompilationError) {
   const auto changedNodes = getChangesForSimulatedLoad(
       g, cmd, dependencyDescriptions, interfaceHashIfNonEmpty,

unittests/Driver/MockingFineGrainedDependencyGraphs.h

@@ -66,7 +66,7 @@ namespace mocking_fine_grained_dependency_graphs {
 
 void simulateLoad(ModuleDepGraph &g, const driver::Job *cmd,
                   const DependencyDescriptions &dependencyDescriptions,
-                  StringRef interfaceHashIfNonEmpty = StringRef(),
+                  Optional<Fingerprint> interfaceHashIfNonEmpty = None,
                   const bool hadCompilationError = false);
 
 /// Same as \ref simulateLoad, but returns the specifically changed nodes or
@@ -75,7 +75,7 @@ void simulateLoad(ModuleDepGraph &g, const driver::Job *cmd,
 ModuleDepGraph::Changes
 getChangesForSimulatedLoad(ModuleDepGraph &g, const driver::Job *cmd,
                            const DependencyDescriptions &dependencyDescriptions,
-                           StringRef interfaceHashIfNonEmpty = StringRef(),
+                           Optional<Fingerprint> interfaceHashIfNonEmpty = None,
                            const bool hadCompilationError = false);
 
 /// Simulates the driver reloading a swiftdeps file after a job has run.
@@ -87,7 +87,7 @@ getChangesForSimulatedLoad(ModuleDepGraph &g, const driver::Job *cmd,
 std::vector<const driver::Job *>
 simulateReload(ModuleDepGraph &g, const driver::Job *cmd,
                const DependencyDescriptions &dependencyDescriptions,
-               StringRef interfaceHashIfNonEmpty = StringRef(),
+               Optional<Fingerprint> interfaceHashIfNonEmpty = None,
                const bool hadCompilationError = false);
 
 std::vector<const driver::Job *>

unittests/Driver/UnitTestSourceFileDepGraphFactory.cpp

@@ -53,10 +53,11 @@ void UnitTestSourceFileDepGraphFactory::addADefinedDecl(StringRef s,
       parseADefinedDecl(s, kind, DeclAspect::interface);
   if (!key)
     return;
-  StringRef fingerprintString = s.split(fingerprintSeparator).second;
-  const Optional<StringRef> fingerprint = fingerprintString.empty()
-                                              ? Optional<StringRef>()
-                                              : StringRef(fingerprintString);
+  auto fingerprintString = s.split(fingerprintSeparator).second.str();
+  fingerprintString.resize(Fingerprint::DIGEST_LENGTH, 'X');
+  const Optional<Fingerprint> fingerprint = fingerprintString.empty()
+                                              ? Optional<Fingerprint>()
+                                              : Fingerprint{fingerprintString};
 
   AbstractSourceFileDepGraphFactory::addADefinedDecl(key.getValue(),
                                                      fingerprint);

unittests/Driver/UnitTestSourceFileDepGraphFactory.h

@@ -28,7 +28,7 @@ class UnitTestSourceFileDepGraphFactory
 public:
   UnitTestSourceFileDepGraphFactory(
       bool hadCompilationError, StringRef swiftDeps,
-      StringRef fileFingerprint, bool emitDotFileAfterConstruction,
+      Fingerprint fileFingerprint, bool emitDotFileAfterConstruction,
       const DependencyDescriptions &dependencyDescriptions,
       DiagnosticEngine &diags)
       : AbstractSourceFileDepGraphFactory(