Skip to content

Commit 729e3c0

Browse files
authored
Merge pull request #77690 from slavapestov/fix-rdar139238003
Sema: Downgrade nonisolated lazy error to warning until -swift-version 6
2 parents 89529af + 473cb0b commit 729e3c0

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

lib/Sema/TypeCheckAttr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7274,7 +7274,7 @@ void AttributeChecker::visitNonisolatedAttr(NonisolatedAttr *attr) {
72747274

72757275
if (var->getAttrs().hasAttribute<LazyAttr>()) {
72767276
diagnoseAndRemoveAttr(attr, diag::nonisolated_lazy)
7277-
.warnUntilSwiftVersionIf(attr->isImplicit(), 6);
7277+
.warnUntilSwiftVersion(6);
72787278
return;
72797279
}
72807280

test/Concurrency/actor_isolation.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -834,29 +834,29 @@ actor LazyActor {
834834
lazy var l25: Int = { [unowned self] in self.l }()
835835

836836
nonisolated lazy var l31: Int = { v }()
837-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
837+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
838838
// expected-warning@-2 {{actor-isolated default value in a nonisolated context; this is an error in the Swift 6 language mode}}
839839
nonisolated lazy var l32: Int = v
840-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
840+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
841841
nonisolated lazy var l33: Int = { self.v }()
842-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
842+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
843843
// expected-warning@-2 {{actor-isolated default value in a nonisolated context; this is an error in the Swift 6 language mode}}
844844
nonisolated lazy var l34: Int = self.v
845-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
845+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
846846
nonisolated lazy var l35: Int = { [unowned self] in self.v }()
847-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
847+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
848848
// expected-warning@-2 {{actor-isolated default value in a nonisolated context; this is an error in the Swift 6 language mode}}
849849

850850
nonisolated lazy var l41: Int = { l }()
851-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
851+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
852852
nonisolated lazy var l42: Int = l
853-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
853+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
854854
nonisolated lazy var l43: Int = { self.l }()
855-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
855+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
856856
nonisolated lazy var l44: Int = self.l
857-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
857+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
858858
nonisolated lazy var l45: Int = { [unowned self] in self.l }()
859-
// expected-error@-1 {{'nonisolated' is not supported on lazy properties}}
859+
// expected-warning@-1 {{'nonisolated' is not supported on lazy properties; this is an error in the Swift 6 language mode}}
860860
}
861861

862862
// Infer global actors from context only for instance members.

0 commit comments

Comments
 (0)