Merge pull request #35487 from CodaFi/mockingjay

Author: swift-ci

include/swift/Basic/Fingerprint.h

@@ -76,10 +76,6 @@ class Fingerprint final {
   /// Strings that violate this invariant will return a null optional.
   static llvm::Optional<Fingerprint> fromString(llvm::StringRef value);
 
-  /// For mocking only:
-  /// Aborts if unconvertible, returns None for an empty string.
-  static llvm::Optional<Fingerprint> mockFromString(llvm::StringRef value);
-
  /// Creates a fingerprint value by consuming the given \c MD5Result from LLVM.
   explicit Fingerprint(llvm::MD5::MD5Result &&MD5Value)
       : core{MD5Value.words()} {}

lib/Basic/Fingerprint.cpp

@@ -48,24 +48,6 @@ Optional<Fingerprint> Fingerprint::fromString(StringRef value) {
   return fp;
 }
 
-Optional<Fingerprint> Fingerprint::mockFromString(llvm::StringRef value) {
-  auto contents = value.str();
-  const auto n = value.size();
-  if (n == 0 || n > Fingerprint::DIGEST_LENGTH)
-    return None;
-  // Insert at start so that "1" and "10" are distinct
-  contents.insert(0, Fingerprint::DIGEST_LENGTH - n, '0');
-  auto fingerprint = fromString(contents);
-    if (!fingerprint) {
-    llvm::errs() << "unconvertable fingerprint from switdeps ':"
-                 << contents << "'\n";
-    abort();
-  }
-  return fingerprint;
-}
-
-
-
 llvm::SmallString<Fingerprint::DIGEST_LENGTH> Fingerprint::getRawValue() const {
   llvm::SmallString<Fingerprint::DIGEST_LENGTH> Str;
   llvm::raw_svector_ostream Res(Str);

unittests/Driver/MockingFineGrainedDependencyGraphs.cpp

@@ -43,7 +43,7 @@ mocking_fine_grained_dependency_graphs::getChangesForSimulatedLoad(
   auto swiftDeps =
     cmd->getOutput().getAdditionalOutputForType(file_types::TY_SwiftDeps).str();
   auto swiftDepsFingerprint =
-    Fingerprint::mockFromString(swiftDeps).getValue();
+    swift::mockFingerprintFromString(swiftDeps).getValue();
   auto interfaceHash = interfaceHashIfNonEmpty.getValueOr(swiftDepsFingerprint);
 
   SourceManager sm;

unittests/Driver/MockingFineGrainedDependencyGraphs.h

@@ -95,6 +95,24 @@ printJobsForDebugging(const std::vector<const driver::Job *> &jobs);
 
 } // end namespace mocking_fine_grained_dependency_graphs
 } // namespace fine_grained_dependencies
+
+/// Aborts if unconvertible, returns \c None for an empty string.
+inline Optional<Fingerprint> mockFingerprintFromString(llvm::StringRef value) {
+  auto contents = value.str();
+  const auto n = value.size();
+  if (n == 0 || n > Fingerprint::DIGEST_LENGTH)
+    return None;
+  // Insert at start so that "1" and "10" are distinct
+  contents.insert(0, Fingerprint::DIGEST_LENGTH - n, '0');
+  auto fingerprint = Fingerprint::fromString(contents);
+    if (!fingerprint) {
+    llvm::errs() << "unconvertable fingerprint from switdeps ':"
+                 << contents << "'\n";
+    abort();
+  }
+  return fingerprint;
+}
+
 } // end namespace swift
 
 #endif /* MOCKING_FINE_GRAINED_DEPENDENCY_GRAPHS_H */

unittests/Driver/UnitTestSourceFileDepGraphFactory.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "UnitTestSourceFileDepGraphFactory.h"
+#include "MockingFineGrainedDependencyGraphs.h"
 
 using namespace swift;
 using namespace swift::fine_grained_dependencies;
@@ -55,7 +56,7 @@ void UnitTestSourceFileDepGraphFactory::addADefinedDecl(StringRef s,
     return;
   auto fingerprintString = s.split(fingerprintSeparator).second.str();
   const Optional<Fingerprint> fingerprint =
-    Fingerprint::mockFromString(fingerprintString);
+    swift::mockFingerprintFromString(fingerprintString);
 
   AbstractSourceFileDepGraphFactory::addADefinedDecl(key.getValue(),
                                                      fingerprint);