Skip to content

Commit 44aab46

Browse files
authored
Merge pull request #38234 from lorentey/revert-unowned-executor-diagnostic-downgrade-5.5
[5.5][Sema] Revert temporary downgrade of diagnostic on misplaced unownedExecutor
2 parents e589ad0 + c26139b commit 44aab46

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

4375-
// FIXME: This diagnostic was temporarily downgraded from an error because
4376-
// it spuriously triggers when building the Foundation module from its textual
4377-
// swiftinterface. (rdar://78932296)
4378-
WARNING(unowned_executor_outside_actor,none,
4375+
ERROR(unowned_executor_outside_actor,none,
43794376
"'unownedExecutor' can only be implemented within the main "
43804377
"definition of an actor", ())
43814378
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)