Merge pull request #81250 from DougGregor/observation-nonisolated-conformances-6.2

DougGregor · web-flow · commit 431aeca5fc8c · 2025-05-05T10:19:53.000-07:00
[6.2] [Observation] Create nonisolated conformances to Observable
diff --git a/lib/Macros/Sources/ObservationMacros/ObservableMacro.swift b/lib/Macros/Sources/ObservationMacros/ObservableMacro.swift
@@ -311,7 +311,7 @@ extension ObservableMacro: ExtensionMacro {
     }
 
     let decl: DeclSyntax = """
-        extension \(raw: type.trimmedDescription): \(raw: qualifiedConformanceName) {}
+        extension \(raw: type.trimmedDescription): nonisolated \(raw: qualifiedConformanceName) {}
         """
     let ext = decl.cast(ExtensionDeclSyntax.self)
 
diff --git a/lib/Sema/TypeCheckMacros.cpp b/lib/Sema/TypeCheckMacros.cpp
@@ -2148,8 +2148,8 @@ std::optional<unsigned> swift::expandExtensions(CustomAttr *attr,
     for (auto i : inheritedTypes.getIndices()) {
       auto constraint =
           TypeResolution::forInterface(
-              extension->getDeclContext(),
-              TypeResolverContext::GenericRequirement,
+              extension,
+              TypeResolverContext::Inherited,
               /*unboundTyOpener*/ nullptr,
               /*placeholderHandler*/ nullptr,
               /*packElementOpener*/ nullptr)

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ extension ObservableMacro: ExtensionMacro {`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`let decl: DeclSyntax = """`
`314`		`- extension \(raw: type.trimmedDescription): \(raw: qualifiedConformanceName) {}`
	`314`	`+ extension \(raw: type.trimmedDescription): nonisolated \(raw: qualifiedConformanceName) {}`
`315`	`315`	`"""`
`316`	`316`	`let ext = decl.cast(ExtensionDeclSyntax.self)`
`317`	`317`