Skip to content

Commit 0057c65

Browse files
authored
Merge pull request swiftlang#38214 from lorentey/revert-unowned-executor-diagnostic-downgrade
[Sema] Revert temporary downgrade of diagnostic on misplaced unownedExecutor
2 parents 5cb144f + 6b07694 commit 0057c65

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4367,10 +4367,7 @@ ERROR(distributed_actor_protocol_illegal_inheritance,none,
43674367
"non-distributed actor type %0 cannot conform to the 'DistributedActor' protocol",
43684368
(DeclName))
43694369

4370-
// FIXME: This diagnostic was temporarily downgraded from an error because
4371-
// it spuriously triggers when building the Foundation module from its textual
4372-
// swiftinterface. (rdar://78932296)
4373-
WARNING(unowned_executor_outside_actor,none,
4370+
ERROR(unowned_executor_outside_actor,none,
43744371
"'unownedExecutor' can only be implemented within the main "
43754372
"definition of an actor", ())
43764373
ERROR(override_implicit_unowned_executor,none,

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4657,10 +4657,7 @@ void ConformanceChecker::resolveValueWitnesses() {
46574657
Adoptee->getClassOrBoundGenericClass() &&
46584658
Adoptee->getClassOrBoundGenericClass()->isActor()) {
46594659
witness->diagnose(diag::unowned_executor_outside_actor);
4660-
// FIXME: This diagnostic was temporarily downgraded from an error to a
4661-
// warning because it spuriously triggers when building the Foundation
4662-
// module from its textual swiftinterface. (rdar://78932296)
4663-
//return;
4660+
return;
46644661
}
46654662

46664663
// Objective-C checking for @objc requirements.

0 commit comments

Comments
 (0)