From a1a67997b7da1e198f727f8173b27cedac700963 Mon Sep 17 00:00:00 2001
From: Steven Wu <stevenwu@apple.com>
Date: Thu, 2 Oct 2025 12:08:10 -0700
Subject: [PATCH] [Caching] Fix -access-note-path when using caching

Make sure to capture access-note when building with swift caching.

rdar://161835182
---
 .../ModuleDependencyScanner.cpp               |  5 +++
 test/CAS/access-notes.swift                   | 41 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 test/CAS/access-notes.swift

diff --git a/lib/DependencyScan/ModuleDependencyScanner.cpp b/lib/DependencyScan/ModuleDependencyScanner.cpp
index 0db8bc41eb60d..aa1917a7f5c35 100644
--- a/lib/DependencyScan/ModuleDependencyScanner.cpp
+++ b/lib/DependencyScan/ModuleDependencyScanner.cpp
@@ -471,6 +471,11 @@ SwiftDependencyTracker::SwiftDependencyTracker(
   // Add blocklist file.
   for (auto &File: CI.getFrontendOptions().BlocklistConfigFilePaths)
     addCommonFile(File);
+
+  // Add access notes.
+  StringRef AccessNotePath = CI.getLangOptions().AccessNotesPath;
+  if (!AccessNotePath.empty())
+    addCommonFile(AccessNotePath);
 }
 
 void SwiftDependencyTracker::startTracking(bool includeCommonDeps) {
diff --git a/test/CAS/access-notes.swift b/test/CAS/access-notes.swift
new file mode 100644
index 0000000000000..868e90929aced
--- /dev/null
+++ b/test/CAS/access-notes.swift
@@ -0,0 +1,41 @@
+// REQUIRES: objc_interop
+
+// RUN: %empty-directory(%t)
+// RUN: split-file %s %t
+
+// RUN: %target-swift-frontend -scan-dependencies -module-name Test -module-cache-path %t/clang-module-cache -O \
+// RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
+// RUN:   %t/main.swift -o %t/deps.json -swift-version 5 -cache-compile-job -cas-path %t/cas -access-notes-path %t/extra.accessnotes
+
+// 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/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:   -typecheck -cache-compile-job -cas-path %t/cas \
+// 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:   %t/main.swift @%t/MyApp.cmd -access-notes-path %t/extra.accessnotes -Raccess-note=all 2>&1 | %FileCheck %s
+
+//--- main.swift
+class Extant {
+  func good(_: Int) {} // expected-remark * {{}} expected-note * {{}}
+  // CHECK-DAG: main.swift:2:{{[0-9]+}}: remark: implicitly added '@objc' to this instance method, as specified by access note for Access notes containing future, unknown syntax
+  // CHECK-DAG: note: add '@objc' explicitly to silence this warning
+
+  func bad(_: Int?) {} // expected-remark * {{}}
+  // CHECK-DAG: main.swift:6:{{[0-9]+}}: remark: ignored access note: instance method cannot be marked '@objc' by an access note because the type of the parameter cannot be represented in Objective-C; did not implicitly add '@objc' to this instance method, even though it was specified by access note for Access notes containing future, unknown syntax
+}
+
+//--- extra.accessnotes
+Reason: Access notes containing future, unknown syntax
+Notes:
+- Name: 'Extant.good(_:)'
+  ObjC: true
+- Name: 'Extant.bad(_:)'
+  ObjC: true