Skip to content

Revert "[Sema] Propagate nonisolated attribute from wrapped property to the synthesized projectedValue property" #60462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2022
Merged

Revert "[Sema] Propagate nonisolated attribute from wrapped property to the synthesized projectedValue property" #60462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions lib/Sema/TypeCheckStorage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2682,13 +2682,6 @@ static VarDecl *synthesizePropertyWrapperProjectionVar(
var->getAttrs().add(
new (ctx) ProjectedValuePropertyAttr(name, SourceLoc(), SourceRange(),
/*Implicit=*/true));

// If the wrapped property has a nonisolated attribute, propagate it to
// the synthesized projectedValue as well.
if (var->getAttrs().getAttribute<NonisolatedAttr>()) {
property->getAttrs().add(new (ctx) NonisolatedAttr(/*Implicit=*/true));
}

return property;
}

Expand Down
44 changes: 0 additions & 44 deletions test/Concurrency/global_actor_inference.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,51 +457,7 @@ func testInferredFromWrapper(x: InferredFromPropertyWrapper) { // expected-note{
_ = x.test() // expected-error{{call to global actor 'SomeGlobalActor'-isolated instance method 'test()' in a synchronous nonisolated context}}
}

// https://github.com/apple/swift/issues/59380
// https://github.com/apple/swift/issues/59494

// Make sure the nonisolated attribute propagates to the synthesized projectedValue
// variable as well.

@propertyWrapper
struct SimplePropertyWrapper {
var wrappedValue: Int { .zero }
var projectedValue: Int { .max }
}

@MainActor
class HasNonIsolatedProperty {
@SimplePropertyWrapper nonisolated var value

deinit {
_ = value
_ = $value // Ok
}
}

@propertyWrapper
struct SimplePropertyWrapper2 {
var wrappedValue: Int
var projectedValue: SimplePropertyWrapper2 { self }
}

@MainActor
class HasNonIsolatedProperty2 {
@SimplePropertyWrapper2 nonisolated var value = 0
nonisolated init() {}
}

let hasNonIsolatedProperty2 = HasNonIsolatedProperty2()

Task { @MainActor in
hasNonIsolatedProperty2.value = 10
_ = hasNonIsolatedProperty2.$value.wrappedValue
}

Task.detached {
hasNonIsolatedProperty2.value = 10
_ = hasNonIsolatedProperty2.$value.wrappedValue // Ok
}

// ----------------------------------------------------------------------
// Unsafe global actors
Expand Down