Skip to content

Commit afb042d

Browse files
authored
Merge pull request #71204 from gottesmm/warnings-to-errors-limit-swift-6
[region-isolation] Change warnings -> errors limited to warnings until swift 6 + a few other changes
2 parents 5008b5c + 4d29c8a commit afb042d

File tree

3 files changed

+241
-83
lines changed

3 files changed

+241
-83
lines changed

include/swift/AST/DiagnosticsSIL.def

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -890,26 +890,29 @@ NOTE(sil_referencebinding_inout_binding_here, none,
890890

891891
// Warnings arising from the flow-sensitive checking of Sendability of
892892
// non-Sendable values
893-
WARNING(regionbasedisolation_selforargtransferred, none,
894-
"call site passes `self` or a non-sendable argument of this function to another thread, potentially yielding a race with the caller", ())
895-
WARNING(regionbasedisolation_transfer_yields_race_no_isolation, none,
896-
"transferring value of non-Sendable type %0; later accesses could race",
897-
(Type))
898-
WARNING(regionbasedisolation_transfer_yields_race_with_isolation, none,
899-
"transferring value of non-Sendable type %0 from %1 context to %2 context; later accesses could race",
900-
(Type, ActorIsolation, ActorIsolation))
901-
WARNING(regionbasedisolation_isolated_capture_yields_race, none,
902-
"%1 closure captures value of non-Sendable type %0 from %2 context; later accesses to value could race",
903-
(Type, ActorIsolation, ActorIsolation))
904-
WARNING(regionbasedisolation_transfer_yields_race_transferring_parameter, none,
905-
"transferring value of non-Sendable type %0 into transferring parameter; later accesses could race",
906-
(Type))
907-
WARNING(regionbasedisolation_transfer_yields_race_stronglytransferred_binding, none,
908-
"binding of non-Sendable type %0 accessed after being transferred; later accesses could race",
909-
(Type))
910-
WARNING(regionbasedisolation_arg_transferred, none,
911-
"task isolated value of type %0 transferred to %1 context; later accesses to value could race",
912-
(Type, ActorIsolation))
893+
ERROR(regionbasedisolation_selforargtransferred, none,
894+
"call site passes `self` or a non-sendable argument of this function to another thread, potentially yielding a race with the caller", ())
895+
ERROR(regionbasedisolation_transfer_yields_race_no_isolation, none,
896+
"transferring value of non-Sendable type %0; later accesses could race",
897+
(Type))
898+
ERROR(regionbasedisolation_transfer_yields_race_with_isolation, none,
899+
"transferring value of non-Sendable type %0 from %1 context to %2 context; later accesses could race",
900+
(Type, ActorIsolation, ActorIsolation))
901+
ERROR(regionbasedisolation_isolated_capture_yields_race, none,
902+
"%1 closure captures value of non-Sendable type %0 from %2 context; later accesses to value could race",
903+
(Type, ActorIsolation, ActorIsolation))
904+
ERROR(regionbasedisolation_transfer_yields_race_transferring_parameter, none,
905+
"transferring value of non-Sendable type %0 into transferring parameter; later accesses could race",
906+
(Type))
907+
ERROR(regionbasedisolation_transfer_yields_race_stronglytransferred_binding, none,
908+
"binding of non-Sendable type %0 accessed after being transferred; later accesses could race",
909+
(Type))
910+
ERROR(regionbasedisolation_arg_transferred, none,
911+
"task isolated value of type %0 transferred to %1 context; later accesses to value could race",
912+
(Type, ActorIsolation))
913+
ERROR(regionbasedisolation_arg_passed_to_strongly_transferred_param, none,
914+
"task isolated value of type %0 passed as a strongly transferred parameter; later accesses could race",
915+
(Type))
913916
NOTE(regionbasedisolation_maybe_race, none,
914917
"access here could race", ())
915918
NOTE(regionbasedisolation_isolated_since_in_same_region_basename, none,

0 commit comments

Comments
 (0)