Skip to content

[5.5] quick downgrade of actor-init restrictions to warning #38314

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
Jul 12, 2021
Merged

[5.5] quick downgrade of actor-init restrictions to warning #38314

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
4 changes: 2 additions & 2 deletions include/swift/AST/DiagnosticsSIL.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ ERROR(self_closure_use_uninit,none,
"'self' captured by a closure before all members were initialized", ())

/// false == sync; true == global-actor isolated
ERROR(self_use_actor_init,none,
WARNING(self_use_actor_init,none,
"this use of actor 'self' %select{can only|cannot}0 appear in "
"%select{an async|a global-actor isolated}0 initializer",
(bool))
ERROR(self_disallowed_actor_init,none,
WARNING(self_disallowed_actor_init,none,
"actor 'self' %select{can only|cannot}0 %1 from "
"%select{an async|a global-actor isolated}0 initializer",
(bool, StringRef))
Expand Down
100 changes: 50 additions & 50 deletions test/Concurrency/actor_definite_init.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ actor Convenient {
init(throwyDesignated val: Int) throws {
guard val > 0 else { throw BogusError.blah }
self.x = 10
say(msg: "hello?") // expected-error {{this use of actor 'self' can only appear in an async initializer}}
say(msg: "hello?") // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { self } // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
Task { self } // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
}

Expand Down Expand Up @@ -109,32 +109,32 @@ actor MyActor {
_ = self.x
self.y = self.x

Task { self } // expected-error{{actor 'self' can only be captured by a closure from an async initializer}}
Task { self } // expected-warning{{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

self.helloWorld() // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.helloWorld() // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

callMethod(self) // expected-error{{this use of actor 'self' can only appear in an async initializer}}
callMethod(self) // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

passInout(&self.x) // expected-error{{actor 'self' can only be passed 'inout' from an async initializer}}
passInout(&self.x) // expected-warning{{actor 'self' can only be passed 'inout' from an async initializer}}

self.x = self.y
self.x = randomInt()
(_, _) = (self.x, self.y)
_ = self.x == 0

self.hax = self // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.hax = self // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
_ = self.hax

_ = computedProp // expected-error{{this use of actor 'self' can only appear in an async initializer}}
_ = computedProp // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

computedProp = 1 // expected-error{{this use of actor 'self' can only appear in an async initializer}}
computedProp = 1 // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
Task { // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
_ = await self.hax
await self.helloWorld()
Expand All @@ -146,29 +146,29 @@ actor MyActor {
guard c else { return nil }
self.y = self.x

Task { self } // expected-error{{actor 'self' can only be captured by a closure from an async initializer}}
Task { self } // expected-warning{{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

self.helloWorld() // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.helloWorld() // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

callMethod(self) // expected-error{{this use of actor 'self' can only appear in an async initializer}}
callMethod(self) // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

passInout(&self.x) // expected-error{{actor 'self' can only be passed 'inout' from an async initializer}}
passInout(&self.x) // expected-warning{{actor 'self' can only be passed 'inout' from an async initializer}}

self.x = self.y

self.hax = self // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.hax = self // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
_ = self.hax

_ = computedProp // expected-error{{this use of actor 'self' can only appear in an async initializer}}
_ = computedProp // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

computedProp = 1 // expected-error{{this use of actor 'self' can only appear in an async initializer}}
computedProp = 1 // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
Task { // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
_ = await self.hax
await self.helloWorld()
Expand All @@ -180,29 +180,29 @@ actor MyActor {
guard c else { return nil }
self.y = self.x

Task { self } // expected-error{{actor 'self' can only be captured by a closure from an async initializer}}
Task { self } // expected-warning{{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

self.helloWorld() // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.helloWorld() // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

callMethod(self) // expected-error{{this use of actor 'self' can only appear in an async initializer}}
callMethod(self) // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

passInout(&self.x) // expected-error{{actor 'self' can only be passed 'inout' from an async initializer}}
passInout(&self.x) // expected-warning{{actor 'self' can only be passed 'inout' from an async initializer}}

self.x = self.y

self.hax = self // expected-error{{this use of actor 'self' can only appear in an async initializer}}
self.hax = self // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
_ = self.hax

_ = computedProp // expected-error{{this use of actor 'self' can only appear in an async initializer}}
_ = computedProp // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

computedProp = 1 // expected-error{{this use of actor 'self' can only appear in an async initializer}}
computedProp = 1 // expected-warning{{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
Task { // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
_ = await self.hax
await self.helloWorld()
Expand All @@ -214,29 +214,29 @@ actor MyActor {
self.x = 0
self.y = self.x

Task { self } // expected-error{{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
Task { self } // expected-warning{{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

self.helloWorld() // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
self.helloWorld() // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

callMethod(self) // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
callMethod(self) // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

passInout(&self.x) // expected-error{{actor 'self' cannot be passed 'inout' from a global-actor isolated initializer}}
passInout(&self.x) // expected-warning{{actor 'self' cannot be passed 'inout' from a global-actor isolated initializer}}

self.x = self.y

self.hax = self // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
self.hax = self // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
_ = self.hax

_ = computedProp // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
_ = computedProp // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

computedProp = 1 // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
computedProp = 1 // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { // expected-error {{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
Task { // expected-warning {{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
_ = await self.hax
await self.helloWorld()
Expand Down Expand Up @@ -272,29 +272,29 @@ actor MyActor {
self.x = 0
self.y = self.x

Task { self } // expected-error{{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
Task { self } // expected-warning{{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

self.helloWorld() // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
self.helloWorld() // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

callMethod(self) // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
callMethod(self) // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

passInout(&self.x) // expected-error{{actor 'self' cannot be passed 'inout' from a global-actor isolated initializer}}
passInout(&self.x) // expected-warning{{actor 'self' cannot be passed 'inout' from a global-actor isolated initializer}}

self.x = self.y

self.hax = self // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
self.hax = self // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
_ = self.hax

_ = computedProp // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
_ = computedProp // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

computedProp = 1 // expected-error{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
computedProp = 1 // expected-warning{{this use of actor 'self' cannot appear in a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

Task { // expected-error {{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
Task { // expected-warning {{actor 'self' cannot be captured by a closure from a global-actor isolated initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
_ = await self.hax
await self.helloWorld()
Expand All @@ -310,7 +310,7 @@ actor X {

init(v1 start: Int) {
self.counter = start
Task { await self.setCounter(start + 1) } // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
Task { await self.setCounter(start + 1) } // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

if self.counter != start {
Expand Down Expand Up @@ -338,7 +338,7 @@ actor EscapeArtist {
init(attempt1: Bool) {
self.x = 0

globalVar = self // expected-error {{this use of actor 'self' can only appear in an async initializer}}
globalVar = self // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
Task { await globalVar!.isolatedMethod() }

if self.x == 0 {
Expand All @@ -349,7 +349,7 @@ actor EscapeArtist {
init(attempt2: Bool) {
self.x = 0

let wrapped: EscapeArtist? = .some(self) // expected-error {{this use of actor 'self' can only appear in an async initializer}}
let wrapped: EscapeArtist? = .some(self) // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
let selfUnchained = wrapped!

Task { await selfUnchained.isolatedMethod() }
Expand All @@ -362,7 +362,7 @@ actor EscapeArtist {
self.x = 0

// expected-warning@+2 {{variable 'unchainedSelf' was never mutated; consider changing to 'let' constant}}
// expected-error@+1 {{this use of actor 'self' can only appear in an async initializer}}
// expected-warning@+1 {{this use of actor 'self' can only appear in an async initializer}}
var unchainedSelf = self

unchainedSelf.nonisolated()
Expand All @@ -373,17 +373,17 @@ actor EscapeArtist {

let unchainedSelf = self

unchainedSelf.nonisolated() // expected-error {{this use of actor 'self' can only appear in an async initializer}}
unchainedSelf.nonisolated() // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}

let _ = { unchainedSelf.nonisolated() } // expected-error {{actor 'self' can only be captured by a closure from an async initializer}}
let _ = { unchainedSelf.nonisolated() } // expected-warning {{actor 'self' can only be captured by a closure from an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
}

init(attempt5: Bool) {
self.x = 0

let box = CardboardBox(item: self) // expected-error {{this use of actor 'self' can only appear in an async initializer}}
let box = CardboardBox(item: self) // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
box.item.nonisolated()
}

Expand All @@ -392,7 +392,7 @@ actor EscapeArtist {
func fn() {
self.nonisolated()
}
fn() // expected-error {{this use of actor 'self' can only appear in an async initializer}}
fn() // expected-warning {{this use of actor 'self' can only appear in an async initializer}}
// expected-note@-1 {{convenience initializers allow non-isolated use of 'self' once initialized}}
}

Expand Down