Skip to content

Commit f1f0ccd

Browse files
committed
[NFC] Improved predicate names.
1 parent 953aca4 commit f1f0ccd

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

include/swift/AST/AnyFunctionRef.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,9 @@ class AnyFunctionRef {
272272
->getReferenceStorageReferent();
273273
if (mapIntoContext)
274274
valueTy = AD->mapTypeIntoContext(valueTy);
275-
YieldTypeFlags flags(
276-
isYieldingDefaultMutatingAccessor(AD->getAccessorKind())
277-
? ParamSpecifier::InOut
278-
: ParamSpecifier::LegacyShared);
275+
YieldTypeFlags flags(isYieldingMutableAccessor(AD->getAccessorKind())
276+
? ParamSpecifier::InOut
277+
: ParamSpecifier::LegacyShared);
279278
buffer.push_back(AnyFunctionType::Yield(valueTy, flags));
280279
return buffer;
281280
}

include/swift/AST/StorageImpl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ inline bool isYieldingAccessor(AccessorKind kind) {
9595
}
9696
}
9797

98-
inline bool isYieldingDefaultNonmutatingAccessor(AccessorKind kind) {
98+
inline bool isYieldingImmutableAccessor(AccessorKind kind) {
9999
switch (kind) {
100100
case AccessorKind::Read:
101101
case AccessorKind::Read2:
@@ -114,7 +114,7 @@ inline bool isYieldingDefaultNonmutatingAccessor(AccessorKind kind) {
114114
}
115115
}
116116

117-
inline bool isYieldingDefaultMutatingAccessor(AccessorKind kind) {
117+
inline bool isYieldingMutableAccessor(AccessorKind kind) {
118118
switch (kind) {
119119
case AccessorKind::Modify:
120120
case AccessorKind::Modify2:

lib/AST/LifetimeDependence.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static ValueOwnership getLoweredOwnership(AbstractFunctionDecl *afd) {
109109
}
110110
if (auto *ad = dyn_cast<AccessorDecl>(afd)) {
111111
if (ad->getAccessorKind() == AccessorKind::Set ||
112-
isYieldingDefaultMutatingAccessor(ad->getAccessorKind())) {
112+
isYieldingMutableAccessor(ad->getAccessorKind())) {
113113
return ValueOwnership::InOut;
114114
}
115115
}

lib/SIL/IR/SILFunctionType.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2202,15 +2202,15 @@ static void destructureYieldsForCoroutine(TypeConverter &TC,
22022202
return;
22032203

22042204
// 'modify' yields an inout of the target type.
2205-
if (isYieldingDefaultMutatingAccessor(accessor->getAccessorKind())) {
2205+
if (isYieldingMutableAccessor(accessor->getAccessorKind())) {
22062206
auto loweredValueTy =
22072207
TC.getLoweredType(origType, canValueType, expansion);
22082208
yields.push_back(SILYieldInfo(loweredValueTy.getASTType(),
22092209
ParameterConvention::Indirect_Inout));
22102210
} else {
22112211
// 'read' yields a borrowed value of the target type, destructuring
22122212
// tuples as necessary.
2213-
assert(isYieldingDefaultNonmutatingAccessor(accessor->getAccessorKind()));
2213+
assert(isYieldingImmutableAccessor(accessor->getAccessorKind()));
22142214
destructureYieldsForReadAccessor(TC, expansion, origType, canValueType,
22152215
yields);
22162216
}

lib/SILGen/SILGenLValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2227,7 +2227,7 @@ namespace {
22272227
auto decl = cast<AccessorDecl>(Accessor.getFuncDecl());
22282228

22292229
// 'modify' always returns an address of the right type.
2230-
if (isYieldingDefaultMutatingAccessor(decl->getAccessorKind())) {
2230+
if (isYieldingMutableAccessor(decl->getAccessorKind())) {
22312231
assert(yields.size() == 1);
22322232
return yields[0];
22332233
}

lib/SILOptimizer/Analysis/DifferentiableActivityAnalysis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void DifferentiableActivityInfo::propagateVariedInwardsThroughProjections(
274274
if (auto *bai = dyn_cast<BeginApplyInst>(inst)) {
275275
if (auto *calleeFn = bai->getCalleeFunction()) {
276276
auto kind = getAccessorKind(calleeFn);
277-
if (kind && isYieldingDefaultMutatingAccessor(*kind))
277+
if (kind && isYieldingMutableAccessor(*kind))
278278
for (auto inoutArg : bai->getInoutArguments())
279279
propagateVariedInwardsThroughProjections(inoutArg, i);
280280
}
@@ -353,7 +353,7 @@ void DifferentiableActivityInfo::propagateUseful(
353353
if (auto *bai = dyn_cast<BeginApplyInst>(inst)) {
354354
if (auto *calleeFn = bai->getCalleeFunction()) {
355355
auto kind = getAccessorKind(calleeFn);
356-
if (kind && isYieldingDefaultMutatingAccessor(*kind))
356+
if (kind && isYieldingMutableAccessor(*kind))
357357
for (auto yield : bai->getYieldedValues())
358358
setUsefulAndPropagateToOperands(yield, i);
359359
}

lib/Sema/TypeCheckStorage.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ static Expr *buildStorageReference(AccessorDecl *accessor,
12011201

12021202
// Check for availability of wrappedValue.
12031203
if (accessor->getAccessorKind() == AccessorKind::Get ||
1204-
isYieldingDefaultNonmutatingAccessor(accessor->getAccessorKind())) {
1204+
isYieldingImmutableAccessor(accessor->getAccessorKind())) {
12051205
diagnoseDeclAvailability(
12061206
wrappedValue,
12071207
var->getAttachedPropertyWrappers()[i]->getRangeWithAt(), nullptr,
@@ -2209,7 +2209,7 @@ synthesizeCoroutineAccessorBody(AccessorDecl *accessor, ASTContext &ctx) {
22092209

22102210
// If this is a variable with an attached property wrapper, then
22112211
// the accessors need to yield the wrappedValue or projectedValue.
2212-
if (isYieldingDefaultNonmutatingAccessor(accessor->getAccessorKind()) ||
2212+
if (isYieldingImmutableAccessor(accessor->getAccessorKind()) ||
22132213
storageReadWriteImpl == ReadWriteImplKind::Modify) {
22142214
if (auto var = dyn_cast<VarDecl>(storage)) {
22152215
if (var->hasAttachedPropertyWrapper()) {
@@ -2226,8 +2226,7 @@ synthesizeCoroutineAccessorBody(AccessorDecl *accessor, ASTContext &ctx) {
22262226
SourceLoc loc = storage->getLoc();
22272227
SmallVector<ASTNode, 1> body;
22282228

2229-
bool isModify =
2230-
isYieldingDefaultMutatingAccessor(accessor->getAccessorKind());
2229+
bool isModify = isYieldingMutableAccessor(accessor->getAccessorKind());
22312230

22322231
// Special-case for a modify coroutine of a simple stored property with
22332232
// observers. We can yield a borrowed copy of the underlying storage
@@ -2543,7 +2542,7 @@ createCoroutineAccessorPrototype(AbstractStorageDecl *storage,
25432542
SourceLoc loc = storage->getLoc();
25442543

25452544
bool isMutating = storage->isGetterMutating();
2546-
if (isYieldingDefaultMutatingAccessor(kind))
2545+
if (isYieldingMutableAccessor(kind))
25472546
isMutating |= storage->isSetterMutating();
25482547

25492548
auto dc = storage->getDeclContext();
@@ -2580,7 +2579,7 @@ createCoroutineAccessorPrototype(AbstractStorageDecl *storage,
25802579
if (FuncDecl *getter = storage->getParsedAccessor(AccessorKind::Get)) {
25812580
asAvailableAs.push_back(getter);
25822581
}
2583-
if (isYieldingDefaultMutatingAccessor(kind)) {
2582+
if (isYieldingMutableAccessor(kind)) {
25842583
if (FuncDecl *setter = storage->getParsedAccessor(AccessorKind::Set)) {
25852584
asAvailableAs.push_back(setter);
25862585
}
@@ -2593,7 +2592,7 @@ createCoroutineAccessorPrototype(AbstractStorageDecl *storage,
25932592
AvailabilityInference::applyInferredAvailableAttrs(accessor, asAvailableAs);
25942593

25952594
// A modify coroutine should have the same SPI visibility as the setter.
2596-
if (isYieldingDefaultMutatingAccessor(kind)) {
2595+
if (isYieldingMutableAccessor(kind)) {
25972596
if (FuncDecl *setter = storage->getParsedAccessor(AccessorKind::Set))
25982597
applyInferredSPIAccessControlAttr(accessor, setter, ctx);
25992598
}

0 commit comments

Comments
 (0)