Skip to content

Commit c26139b

Browse files
committed
[Sema] Revert temporary downgrade of misplaced unownedExecutor diagnostic
rdar://78932296 (cherry picked from commit 6b07694)
1 parent bbb018b commit c26139b

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
@@ -4370,10 +4370,7 @@ ERROR(actor_protocol_illegal_inheritance,none,
43704370
"non-actor type %0 cannot conform to the 'Actor' protocol",
43714371
(DeclName))
43724372

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

lib/Sema/TypeCheckProtocol.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4584,10 +4584,7 @@ void ConformanceChecker::resolveValueWitnesses() {
45844584
Adoptee->getClassOrBoundGenericClass() &&
45854585
Adoptee->getClassOrBoundGenericClass()->isActor()) {
45864586
witness->diagnose(diag::unowned_executor_outside_actor);
4587-
// FIXME: This diagnostic was temporarily downgraded from an error to a
4588-
// warning because it spuriously triggers when building the Foundation
4589-
// module from its textual swiftinterface. (rdar://78932296)
4590-
//return;
4587+
return;
45914588
}
45924589

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

0 commit comments

Comments
 (0)