Skip to content

Commit 925b72e

Browse files
Merge pull request swiftlang#76337 from DePasqualeOrg/grammar-compound-modifiers
Grammatical corrections for compound modifiers
2 parents cfe6195 + c9b1738 commit 925b72e

36 files changed

+84
-84
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ And the module structure to support such applications looks like this:
447447

448448
* [SE-0430][]:
449449

450-
Region Based Isolation is now extended to enable the application of an
450+
Region-Based Isolation is now extended to enable the application of an
451451
explicit `sending` annotation to function parameters and results. A function
452452
parameter or result that is annotated with `sending` is required to be
453453
disconnected at the function boundary and thus possesses the capability of
@@ -485,7 +485,7 @@ And the module structure to support such applications looks like this:
485485

486486
func useValue() {
487487
let x = NonSendableType()
488-
let a = await MyActor(x) // Error without Region Based Isolation!
488+
let a = await MyActor(x) // Error without Region-Based Isolation!
489489
}
490490
```
491491

include/swift/AST/DiagnosticsSIL.def

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -964,10 +964,10 @@ NOTE(sil_referencebinding_inout_binding_here, none,
964964
())
965965

966966
//===----------------------------------------------------------------------===//
967-
// MARK: Region Based Isolation Diagnostics
967+
// MARK: Region-Based Isolation Diagnostics
968968
//===----------------------------------------------------------------------===//
969969

970-
// READ THIS: Please when adding diagnostics for region based isolation, keep
970+
// READ THIS: Please when adding diagnostics for region-based isolation, keep
971971
// them ordered in sections depending on which emitter uses it. It makes it
972972
// easier for people unfamiliar with the code to quickly see which diagnostics
973973
// are used by which of the SendNonSendable emitters use.
@@ -976,7 +976,7 @@ NOTE(sil_referencebinding_inout_binding_here, none,
976976
// Misc
977977

978978
ERROR(regionbasedisolation_unknown_pattern, none,
979-
"pattern that the region based isolation checker does not understand how to check. Please file a bug",
979+
"pattern that the region-based isolation checker does not understand how to check. Please file a bug",
980980
())
981981
NOTE(regionbasedisolation_maybe_race, none,
982982
"access can happen concurrently", ())
@@ -1098,13 +1098,13 @@ NOTE(regionbasedisolation_typed_sendneversendable_via_arg_callee, none,
10981098
// Error that is only used when the send non sendable emitter cannot discover any
10991099
// information to give a better diagnostic.
11001100
ERROR(regionbasedisolation_task_or_actor_isolated_sent, none,
1101-
"task or actor isolated value cannot be sent", ())
1101+
"task or actor-isolated value cannot be sent", ())
11021102

11031103
//===
11041104
// InOut Sending Emitter
11051105

11061106
NOTE(regionbasedisolation_inout_sending_must_be_reinitialized, none,
1107-
"'inout sending' parameter must be reinitialized before function exit with a non-actor isolated value",
1107+
"'inout sending' parameter must be reinitialized before function exit with a non-actor-isolated value",
11081108
())
11091109
ERROR(regionbasedisolation_inout_sending_cannot_be_actor_isolated, none,
11101110
"'inout sending' parameter %0 cannot be %1at end of function",

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5757,7 +5757,7 @@ NOTE(note_actor_isolated_witness,none,
57575757
"%0 %kind1 cannot satisfy %2 requirement",
57585758
(ActorIsolation, const ValueDecl *, ActorIsolation))
57595759
ERROR(actor_cannot_conform_to_global_actor_protocol,none,
5760-
"actor %0 cannot conform to global actor isolated protocol %1",
5760+
"actor %0 cannot conform to global-actor-isolated protocol %1",
57615761
(Type, Type))
57625762
NOTE(protocol_isolated_to_global_actor_here,none,
57635763
"%0 is isolated to global actor %1 here", (Type, Type))

include/swift/Option/FrontendOptions.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ def platform_c_calling_convention_EQ :
14911491

14921492
def disable_sending_args_and_results_with_region_isolation : Flag<["-"],
14931493
"disable-sending-args-and-results-with-region-based-isolation">,
1494-
HelpText<"Disable sending args and results when region based isolation is enabled. Only enabled with asserts">,
1494+
HelpText<"Disable sending args and results when region-based isolation is enabled. Only enabled with asserts">,
14951495
Flags<[HelpHidden]>;
14961496

14971497
def scanner_module_validation: Flag<["-"], "scanner-module-validation">,

include/swift/SILOptimizer/Analysis/RegionAnalysis.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,15 +391,15 @@ class RegionAnalysisValueMap {
391391
}
392392

393393
/// Returns the value for this instruction if it isn't a fake "represenative
394-
/// value" to inject actor isolatedness. Asserts in such a case.
394+
/// value" to inject actor isolation. Asserts in such a case.
395395
SILValue getRepresentative(Element trackableValueID) const;
396396

397397
/// Returns the value for this instruction. If it is a fake "representative
398398
/// value" returns an empty SILValue.
399399
SILValue maybeGetRepresentative(Element trackableValueID) const;
400400

401401
/// Returns the value for this instruction if it isn't a fake "represenative
402-
/// value" to inject actor isolatedness. Asserts in such a case.
402+
/// value" to inject actor isolation. Asserts in such a case.
403403
RepresentativeValue getRepresentativeValue(Element trackableValueID) const;
404404

405405
/// Returns the fake "representative value" for this element if it

include/swift/SILOptimizer/Utils/PartitionUtils.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class RegionAnalysisValueMap;
9393
/// The representative value of the equivalence class that makes up a tracked
9494
/// value.
9595
///
96-
/// We use a wrapper struct here so that we can inject "fake" actor isolated
96+
/// We use a wrapper struct here so that we can inject "fake" actor-isolated
9797
/// values into the regions of values that become merged into an actor by
9898
/// calling a function without a non-sendable result.
9999
class RepresentativeValue {
@@ -103,8 +103,8 @@ class RepresentativeValue {
103103

104104
/// If this is set to a SILValue then it is the actual represented value. If
105105
/// it is set to a SILInstruction, then this is a "fake" representative value
106-
/// used to inject actor isolatedness. The instruction stored is the
107-
/// instruction that introduced the actor isolated-ness.
106+
/// used to inject actor isolation. The instruction stored is the
107+
/// instruction that introduced the actor isolation.
108108
InnerType value;
109109

110110
public:

include/swift/SILOptimizer/Utils/SILIsolationInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ class SILIsolationInfo {
486486
/// for the isolated values if any to not match.
487487
///
488488
/// This is useful if one has two non-Sendable values projected from the same
489-
/// actor or global actor isolated value. E.x.: two different ref_element_addr
489+
/// actor or global-actor-isolated value. E.x.: two different ref_element_addr
490490
/// from the same actor.
491491
bool hasSameIsolation(const SILIsolationInfo &other) const;
492492

lib/DriverTool/sil_opt_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ int sil_opt_main(ArrayRef<const char *> argv, void *MainAddr) {
831831
}
832832

833833
// If we have strict concurrency set as a feature and were told to turn off
834-
// region based isolation... do so now.
834+
// region-based isolation... do so now.
835835
if (Invocation.getLangOptions().hasFeature(Feature::StrictConcurrency)) {
836836
Invocation.getLangOptions().enableFeature(Feature::RegionBasedIsolation);
837837
}

lib/SILGen/SILGenApply.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ FunctionTypeInfo SILGenFunction::getClosureTypeInfo(AbstractClosureExpr *expr) {
6262
auto fnType = cast<AnyFunctionType>(expr->getType()->getCanonicalType());
6363

6464
// If we have a closure expr that has inherits actor context, work around AST
65-
// issues that causes us to be able to get non-Sendable actor isolated
65+
// issues that causes us to be able to get non-Sendable actor-isolated
6666
// closures.
6767
if (auto *ce = dyn_cast<ClosureExpr>(expr)) {
6868
if (ce->inheritsActorContext() && fnType->isAsync() &&

lib/SILGen/SILGenConcurrency.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ void SILGenFunction::emitExpectedExecutorProlog() {
155155
}();
156156

157157
// FIXME: Avoid loading and checking the expected executor if concurrency is
158-
// unavailable. This is specifically relevant for MainActor isolated contexts,
158+
// unavailable. This is specifically relevant for MainActor-isolated contexts,
159159
// which are allowed to be available on OSes where concurrency is not
160160
// available. rdar://106827064
161161

0 commit comments

Comments
 (0)