Merge pull request #76088 from cachemeifyoucan/eng/PR-134593841

[Caching] CASFS need to include blocklist

Author: cachemeifyoucan

include/swift/AST/ModuleDependencies.h

@@ -20,7 +20,6 @@
 
 #include "swift/AST/Import.h"
 #include "swift/AST/LinkLibrary.h"
-#include "swift/AST/SearchPathOptions.h"
 #include "swift/Basic/CXXStdlibKind.h"
 #include "swift/Basic/LLVM.h"
 #include "clang/CAS/CASOptions.h"
@@ -53,6 +52,7 @@ class ASTContext;
 class Identifier;
 class CompilerInstance;
 class IRGenOptions;
+class CompilerInvocation;
 
 /// Which kind of module dependencies we are looking for.
 enum class ModuleDependencyKind : int8_t {
@@ -945,7 +945,7 @@ class SwiftDependencyTracker {
       : FS(FS.createProxyFS()), Mapper(Mapper) {}
 
   void startTracking();
-  void addCommonSearchPathDeps(const SearchPathOptions &Opts);
+  void addCommonSearchPathDeps(const CompilerInvocation &CI);
   void trackFile(const Twine &path) { (void)FS->status(path); }
   llvm::Expected<llvm::cas::ObjectProxy> createTreeFromDependencies();
 

lib/AST/ModuleDependencies.cpp

@@ -612,10 +612,11 @@ swift::dependencies::registerBackDeployLibraries(
 }
 
 void SwiftDependencyTracker::addCommonSearchPathDeps(
-    const SearchPathOptions &Opts) {
+    const CompilerInvocation &CI) {
+  auto &SearchPathOpts = CI.getSearchPathOptions();
   // Add SDKSetting file.
   SmallString<256> SDKSettingPath;
-  llvm::sys::path::append(SDKSettingPath, Opts.getSDKPath(),
+  llvm::sys::path::append(SDKSettingPath, SearchPathOpts.getSDKPath(),
                           "SDKSettings.json");
   FS->status(SDKSettingPath);
 
@@ -624,7 +625,7 @@ void SwiftDependencyTracker::addCommonSearchPathDeps(
       "arm64", "arm64e", "x86_64", "i386",
       "armv7", "armv7s", "armv7k", "arm64_32"};
 
-  for (auto RuntimeLibPath : Opts.RuntimeLibraryPaths) {
+  for (auto RuntimeLibPath : SearchPathOpts.RuntimeLibraryPaths) {
     std::error_code EC;
     for (auto &Arch : AllSupportedArches) {
       SmallString<256> LayoutFile(RuntimeLibPath);
@@ -634,8 +635,12 @@ void SwiftDependencyTracker::addCommonSearchPathDeps(
   }
 
   // Add VFSOverlay file.
-  for (auto &Overlay: Opts.VFSOverlayFiles)
+  for (auto &Overlay: SearchPathOpts.VFSOverlayFiles)
     FS->status(Overlay);
+
+  // Add blocklist file.
+  for (auto &File: CI.getFrontendOptions().BlocklistConfigFilePaths)
+    FS->status(File);
 }
 
 void SwiftDependencyTracker::startTracking() {

lib/DependencyScan/ScanDependencies.cpp

@@ -338,8 +338,7 @@ static llvm::Error resolveExplicitModuleInputs(
     // Compute the CASFS root ID for the resolving dependency.
     if (auto *sourceDep = resolvingDepInfo.getAsSwiftSourceModule()) {
       tracker->startTracking();
-      tracker->addCommonSearchPathDeps(
-          instance.getInvocation().getSearchPathOptions());
+      tracker->addCommonSearchPathDeps(instance.getInvocation());
       llvm::for_each(
           sourceDep->sourceFiles,
           [&tracker](const std::string &file) { tracker->trackFile(file); });
@@ -359,8 +358,7 @@ static llvm::Error resolveExplicitModuleInputs(
     } else if (auto *textualDep =
                    resolvingDepInfo.getAsSwiftInterfaceModule()) {
       tracker->startTracking();
-      tracker->addCommonSearchPathDeps(
-          instance.getInvocation().getSearchPathOptions());
+      tracker->addCommonSearchPathDeps(instance.getInvocation());
       tracker->trackFile(textualDep->swiftInterfaceFile);
       llvm::for_each(
           textualDep->auxiliaryFiles,

test/CAS/block-list.swift

@@ -0,0 +1,57 @@
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+
+// RUN: %target-swift-frontend -scan-dependencies -module-name Test -O \
+// RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
+// RUN:   -blocklist-file %t/blocklist.yml -blocklist-file %t/empty.yml \
+// RUN:   %t/main.swift -o %t/deps.json -cache-compile-job -cas-path %t/cas 
+
+// RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json clang:SwiftShims > %t/shim.cmd
+// RUN: %swift_frontend_plain @%t/shim.cmd
+
+// RUN: %{python} %S/Inputs/SwiftDepsExtractor.py %t/deps.json Test casFSRootID > %t/fs.casid
+// DISABLE: llvm-cas --cas %t/cas --ls-tree-recursive @%t/fs.casid | %FileCheck %s -check-prefix FS
+
+// FS-DAG: blocklist.yml
+// FS-DAG: empty.yml
+
+// RUN: %{python} %S/Inputs/GenerateExplicitModuleMap.py %t/deps.json > %t/map.json
+// RUN: llvm-cas --cas %t/cas --make-blob --data %t/map.json > %t/map.casid
+
+// RUN: %{python} %S/Inputs/BuildCommandExtractor.py %t/deps.json Test > %t/MyApp.cmd
+
+// RUN: %target-swift-frontend \
+// RUN:   -emit-ir -o - -cache-compile-job -cas-path %t/cas -O \
+// RUN:   -swift-version 5 -disable-implicit-swift-modules \
+// RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
+// RUN:   -module-name Test -explicit-swift-module-map-file @%t/map.casid \
+// RUN:   -blocklist-file %t/blocklist.yml -blocklist-file %t/empty.yml \
+// RUN:   -enable-layout-string-value-witnesses -enable-layout-string-value-witnesses-instantiation \
+// RUN:   -enable-experimental-feature LayoutStringValueWitnesses -enable-experimental-feature LayoutStringValueWitnessesInstantiation \
+// RUN:   %t/main.swift @%t/MyApp.cmd 2>&1 | %FileCheck %s --check-prefix CHECK-BLOCKED
+
+// CHECK-BLOCKED: note: Layout string value witnesses have been disabled for module 'Test' through block list entry
+// CHECK-BLOCKED-NOT: type_layout_string
+
+//--- main.swift
+public struct Bar {
+    let x: Int
+    let y: AnyObject
+}
+
+public enum Foo {
+    case a(AnyObject)
+    case b(Int, AnyObject)
+    case c
+}
+
+//--- blocklist.yml
+---
+ShouldUseLayoutStringValueWitnesses:
+    ModuleName:
+        - Test
+//--- empty.yml
+---
+PlaceHolder:
+    ModuleName:
+        - A