Merge pull request #22394 from harlanhaskins/target-locked

[ParseableInterface] Use arch for cache key instead of full triple

Author: Harlan Haskins

include/swift/Frontend/ParseableInterfaceSupport.h

@@ -15,6 +15,8 @@
 
 #include "swift/Basic/LLVM.h"
 #include "swift/Serialization/SerializedModuleLoader.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/Support/Errc.h"
 #include "llvm/Support/Regex.h"
 
 namespace swift {
@@ -29,6 +31,25 @@ struct ParseableInterfaceOptions {
   std::string ParseableInterfaceFlags;
 };
 
+class PrebuiltModuleCache {
+  StringRef cacheDir;
+  llvm::DenseMap<StringRef, uint64_t> hashedContents;
+  PrebuiltModuleCache(StringRef cacheDir): cacheDir(cacheDir) {}
+
+  std::error_code loadHashes();
+public:
+  static llvm::ErrorOr<PrebuiltModuleCache>
+  loadFromDirectory(StringRef directory);
+
+  StringRef getDirectory() { return cacheDir; }
+
+  Optional<uint64_t> getInterfaceHash(StringRef moduleName) {
+    auto it = hashedContents.find(moduleName);
+    if (it == hashedContents.end()) return None;
+    return it->second;
+  }
+};
+
 llvm::Regex getSwiftInterfaceFormatVersionRegex();
 llvm::Regex getSwiftInterfaceModuleFlagsRegex();
 

lib/Frontend/ParseableInterfaceSupport.cpp

@@ -134,11 +134,12 @@ static std::string getCacheHash(ASTContext &Ctx,
   // pathname, and probably all we can get from the VFS in this regard anyways.
   H = hash_combine(H, InPath);
 
-  // Include the target CPU. In practice, .swiftinterface files will be in
-  // architecture-specific subdirectories and would have target-specific pieces
-  // #if'd out. However, it doesn't hurt to include it, and it guards against
-  // mistakenly reusing cached modules across targets.
-  H = hash_combine(H, SubInvocation.getTargetTriple());
+  // Include the target CPU architecture. In practice, .swiftinterface files
+  // will be in architecture-specific subdirectories and would have
+  // architecture-specific pieces #if'd out. However, it doesn't hurt to
+  // include it, and it guards against mistakenly reusing cached modules across
+  // architectures.
+  H = hash_combine(H, SubInvocation.getLangOptions().Target.getArchName());
 
   // The SDK path is going to affect how this module is imported, so include it.
   H = hash_combine(H, SubInvocation.getSDKPath());

test/ParseableInterface/ModuleCache/module-cache-deployment-target-irrelevant.swift

@@ -0,0 +1,32 @@
+// This test specifically uses macOS deployment targets
+// REQUIRES: OS=macosx
+//
+// RUN: %empty-directory(%t)
+//
+// Test will build a module TestModule that depends on OtherModule and LeafModule (built from other.swift and leaf.swift).
+//
+// RUN: echo 'public func LeafFunc() -> Int { return 10; }' >%t/leaf.swift
+//
+// RUN: echo 'import LeafModule' >%t/other.swift
+// RUN: echo 'public func OtherFunc() -> Int { return LeafFunc(); }' >>%t/other.swift
+//
+// Phase 1: build LeafModule into a .swiftinterface file with -target x86_64-macosx-10.9:
+//
+// RUN: %swift -target x86_64-apple-macosx10.9 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/LeafModule.swiftinterface -module-name LeafModule %t/leaf.swift -typecheck
+//
+// Phase 2: build OtherModule into a .swiftinterface file with -target x86_64-macosx-10.10:
+//
+// RUN: %swift -target x86_64-apple-macosx10.10 -I %t -module-cache-path %t/modulecache -emit-parseable-module-interface-path %t/OtherModule.swiftinterface -module-name OtherModule %t/other.swift -enable-parseable-module-interface -typecheck
+//
+// Phase 3: build TestModule in -target x86_64-apple-macosx10.11 and import both of these:
+//
+// RUN: %swift -target x86_64-apple-macosx10.11  -I %t -module-cache-path %t/modulecache -module-name TestModule %s -enable-parseable-module-interface -typecheck
+//
+// Phase 4: make sure we only compiled LeafModule and OtherModule one time:
+//
+// RUN: NUM_LEAF_MODULES=$(find %t/modulecache -type f -name 'LeafModule-*.swiftmodule' | wc -l)
+// RUN: NUM_OTHER_MODULES=$(find %t/modulecache -type f -name 'OtherModule-*.swiftmodule' | wc -l)
+// RUN: if [ ! $NUM_LEAF_MODULES -eq 1 ]; then echo "Should only be 1 LeafModule, found $NUM_LEAF_MODULES"; exit 1; fi
+// RUN: if [ ! $NUM_OTHER_MODULES -eq 1 ]; then echo "Should only be 1 OtherModule, found $NUM_OTHER_MODULES"; exit 1; fi
+import LeafModule
+import OtherModule