Skip to content

Commit c249357

Browse files
authored
Merge pull request #81249 from DougGregor/observation-nonisolated-conformances
[Observation] Create nonisolated conformances to Observable
2 parents 20e4413 + fed18d5 commit c249357

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

lib/Macros/Sources/ObservationMacros/ObservableMacro.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ extension ObservableMacro: ExtensionMacro {
381381
}
382382

383383
let decl: DeclSyntax = """
384-
extension \(raw: type.trimmedDescription): \(raw: qualifiedConformanceName) {}
384+
extension \(raw: type.trimmedDescription): nonisolated \(raw: qualifiedConformanceName) {}
385385
"""
386386
let ext = decl.cast(ExtensionDeclSyntax.self)
387387

lib/Sema/TypeCheckMacros.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,8 +2152,8 @@ std::optional<unsigned> swift::expandExtensions(CustomAttr *attr,
21522152
for (auto i : inheritedTypes.getIndices()) {
21532153
auto constraint =
21542154
TypeResolution::forInterface(
2155-
extension->getDeclContext(),
2156-
TypeResolverContext::GenericRequirement,
2155+
extension,
2156+
TypeResolverContext::Inherited,
21572157
/*unboundTyOpener*/ nullptr,
21582158
/*placeholderHandler*/ nullptr,
21592159
/*packElementOpener*/ nullptr)

stdlib/public/Concurrency/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,14 @@ set(LLVM_OPTIONAL_SOURCES
205205
DispatchGlobalExecutor.cpp
206206
)
207207

208+
set(SWIFT_CONCURRENCY_DEPENDENCIES)
209+
if((SWIFT_BUILD_CLANG_OVERLAYS
210+
OR SWIFT_BUILD_TEST_SUPPORT_MODULES)
211+
AND (NOT DEFINED SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT
212+
OR NOT SWIFT_BUILD_CLANG_OVERLAYS_SKIP_BUILTIN_FLOAT))
213+
set(SWIFT_CONCURRENCY_DEPENDENCIES _Builtin_float)
214+
endif()
215+
208216
add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
209217
${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
210218
${SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES}
@@ -216,6 +224,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
216224
TaskGroup+addTask.swift.gyb
217225
Task+startSynchronously.swift.gyb
218226

227+
SWIFT_MODULE_DEPENDS ${SWIFT_CONCURRENCY_DEPENDENCIES}
219228
SWIFT_MODULE_DEPENDS_ANDROID Android
220229
SWIFT_MODULE_DEPENDS_LINUX Glibc
221230
SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl

0 commit comments

Comments
 (0)