Merge pull request #86304 from hamishknight/at-request

[Serialization] Ensure semantic attributes are serialized

Author: hamishknight

lib/Serialization/Serialization.cpp

@@ -4180,7 +4180,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
       writeABIOnlyCounterpart(abiRole.getCounterpartUnchecked());
 
     // Emit attributes (if any).
-    for (auto Attr : D->getAttrs())
+    for (auto Attr : D->getSemanticAttrs())
       writeDeclAttribute(D, Attr);
 
     if (auto *value = dyn_cast<ValueDecl>(D))

test/Concurrency/nonisolated_nonsending_lazy_typecheck.swift

@@ -0,0 +1,40 @@
+// %empty-directory(%t)
+// RUN: split-file %s %t
+
+// REQUIRES: swift_feature_NonisolatedNonsendingByDefault
+
+// Test both with and without '-experimental-lazy-typecheck'
+// RUN: %swift-frontend -emit-module %t/Lib.swift -swift-version 6 -experimental-lazy-typecheck -experimental-skip-all-function-bodies -enable-upcoming-feature NonisolatedNonsendingByDefault -module-name Lib -o %t/Modules/Lib.swiftmodule
+// RUN: %swift-frontend -emit-sil %t/Test.swift -I %t/Modules -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault
+
+// RUN: %swift-frontend -emit-module %t/Lib.swift -swift-version 6 -experimental-skip-all-function-bodies -enable-upcoming-feature NonisolatedNonsendingByDefault -module-name Lib -o %t/Modules/Lib.swiftmodule
+// RUN: %swift-frontend -emit-sil %t/Test.swift -I %t/Modules -swift-version 6 -enable-upcoming-feature NonisolatedNonsendingByDefault
+
+//--- Lib.swift
+
+public final class IndexStoreDownloadManager2: Sendable {
+  public func withIndexStore(
+    body: (String) async throws -> Void
+  ) async throws {
+  }
+}
+
+//--- Test.swift
+
+import Lib
+
+private func `import`(
+  indexStoreDownloadManager: IndexStoreDownloadManager2,
+) async throws {
+  import2(
+    indexStoreProvider: { runWithIndexStore in
+      // Make sure we don't error here since `withIndexStore` is nonisolated(nonsending)
+      try await indexStoreDownloadManager.withIndexStore(body: runWithIndexStore)
+    }
+  )
+}
+
+func import2(
+  indexStoreProvider: (_ runWithIndexStore: (_ indexStore: String) async throws -> Void) async throws -> Void,
+) {
+}