Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions lib/Sema/TypeCheckAttr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7982,6 +7982,14 @@ void AttributeChecker::visitNonisolatedAttr(NonisolatedAttr *attr) {
}
}

// `nonisolated` on an actor declaration is contradictory.
if (auto *classDecl = dyn_cast<ClassDecl>(D);
classDecl && classDecl->isExplicitActor()) {
diagnoseAndRemoveAttr(attr, diag::invalid_decl_modifier, attr)
.fixItRemove(attr->getRange());
return;
}

if (auto VD = dyn_cast<ValueDecl>(D)) {
//'nonisolated(unsafe)' is meaningless for computed properties, functions etc.
auto var = dyn_cast<VarDecl>(VD);
Expand Down
2 changes: 2 additions & 0 deletions test/decl/class/actor/basic.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ extension A2 {

init(doesNotDelegate: ()) {} // expected-error {{designated initializer cannot be declared in an extension of 'A2'}}
}

nonisolated actor A3 {} // expected-error {{'nonisolated' modifier cannot be applied to this declaration}}{{1-13=}}
2 changes: 2 additions & 0 deletions test/decl/protocol/special/DistributedActor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ distributed actor D5: P1 {
// expected-note@-1{{non-distributed instance method 'dist()'}}
}

nonisolated distributed actor D6 {} // expected-error {{'nonisolated' modifier cannot be applied to this declaration}}{{1-13=}}

// ==== Tests ------------------------------------------------------------------

// Make sure the conformances have been added implicitly.
Expand Down