Skip to content

Commit 815d7a6

Browse files
committed
Replace hasLifetimeDependenceInfo -> hasLifetimeDependencies
1 parent 7499cf3 commit 815d7a6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

include/swift/AST/Types.h

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ class alignas(1 << TypeAlignInBits) TypeBase
417417
HasExtInfo : 1,
418418
HasClangTypeInfo : 1,
419419
HasThrownError : 1,
420-
HasLifetimeDependenceInfo : 1,
420+
HasLifetimeDependencies : 1,
421421
: NumPadBits,
422422
NumParams : 16
423423
);
@@ -3366,7 +3366,7 @@ class AnyFunctionType : public TypeBase {
33663366
Bits.AnyFunctionType.HasThrownError =
33673367
!Info.value().getThrownError().isNull();
33683368
assert(!Bits.AnyFunctionType.HasThrownError || Info->isThrowing());
3369-
Bits.AnyFunctionType.HasLifetimeDependenceInfo =
3369+
Bits.AnyFunctionType.HasLifetimeDependencies =
33703370
!Info.value().getLifetimeDependencies().empty();
33713371
// The use of both assert() and static_assert() is intentional.
33723372
assert(Bits.AnyFunctionType.ExtInfoBits == Info.value().getBits() &&
@@ -3379,7 +3379,7 @@ class AnyFunctionType : public TypeBase {
33793379
Bits.AnyFunctionType.HasClangTypeInfo = false;
33803380
Bits.AnyFunctionType.ExtInfoBits = 0;
33813381
Bits.AnyFunctionType.HasThrownError = false;
3382-
Bits.AnyFunctionType.HasLifetimeDependenceInfo = false;
3382+
Bits.AnyFunctionType.HasLifetimeDependencies = false;
33833383
}
33843384
Bits.AnyFunctionType.NumParams = NumParams;
33853385
assert(Bits.AnyFunctionType.NumParams == NumParams && "Params dropped!");
@@ -3426,8 +3426,8 @@ class AnyFunctionType : public TypeBase {
34263426
return Bits.AnyFunctionType.HasThrownError;
34273427
}
34283428

3429-
bool hasLifetimeDependenceInfo() const {
3430-
return Bits.AnyFunctionType.HasLifetimeDependenceInfo;
3429+
bool hasLifetimeDependencies() const {
3430+
return Bits.AnyFunctionType.HasLifetimeDependencies;
34313431
}
34323432

34333433
ClangTypeInfo getClangTypeInfo() const;
@@ -3735,11 +3735,11 @@ class FunctionType final
37353735
}
37363736

37373737
size_t numTrailingObjects(OverloadToken<size_t>) const {
3738-
return hasLifetimeDependenceInfo() ? 1 : 0;
3738+
return hasLifetimeDependencies() ? 1 : 0;
37393739
}
37403740

37413741
size_t numTrailingObjects(OverloadToken<LifetimeDependenceInfo>) const {
3742-
return hasLifetimeDependenceInfo() ? getNumLifetimeDependencies() : 0;
3742+
return hasLifetimeDependencies() ? getNumLifetimeDependencies() : 0;
37433743
}
37443744

37453745
public:
@@ -3774,13 +3774,13 @@ class FunctionType final
37743774
}
37753775

37763776
inline size_t getNumLifetimeDependencies() const {
3777-
if (!hasLifetimeDependenceInfo())
3777+
if (!hasLifetimeDependencies())
37783778
return 0;
37793779
return getTrailingObjects<size_t>()[0];
37803780
}
37813781

37823782
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
3783-
if (!hasLifetimeDependenceInfo())
3783+
if (!hasLifetimeDependencies())
37843784
return std::nullopt;
37853785
return {getTrailingObjects<LifetimeDependenceInfo>(),
37863786
getNumLifetimeDependencies()};
@@ -3905,11 +3905,11 @@ class GenericFunctionType final
39053905
}
39063906

39073907
size_t numTrailingObjects(OverloadToken<size_t>) const {
3908-
return hasLifetimeDependenceInfo() ? 1 : 0;
3908+
return hasLifetimeDependencies() ? 1 : 0;
39093909
}
39103910

39113911
size_t numTrailingObjects(OverloadToken<LifetimeDependenceInfo>) const {
3912-
return hasLifetimeDependenceInfo() ? getNumLifetimeDependencies() : 0;
3912+
return hasLifetimeDependencies() ? getNumLifetimeDependencies() : 0;
39133913
}
39143914

39153915
/// Construct a new generic function type.
@@ -3941,13 +3941,13 @@ class GenericFunctionType final
39413941
}
39423942

39433943
inline size_t getNumLifetimeDependencies() const {
3944-
if (!hasLifetimeDependenceInfo())
3944+
if (!hasLifetimeDependencies())
39453945
return 0;
39463946
return getTrailingObjects<size_t>()[0];
39473947
}
39483948

39493949
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
3950-
if (!hasLifetimeDependenceInfo())
3950+
if (!hasLifetimeDependencies())
39513951
return std::nullopt;
39523952
return {getTrailingObjects<LifetimeDependenceInfo>(),
39533953
getNumLifetimeDependencies()};
@@ -5352,12 +5352,12 @@ class SILFunctionType final
53525352

53535353
ClangTypeInfo getClangTypeInfo() const;
53545354

5355-
bool hasLifetimeDependenceInfo() const {
5355+
bool hasLifetimeDependencies() const {
53565356
return NumLifetimeDependencies != 0;
53575357
}
53585358

53595359
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies() const {
5360-
if (!hasLifetimeDependenceInfo())
5360+
if (!hasLifetimeDependencies())
53615361
return std::nullopt;
53625362
return {getTrailingObjects<LifetimeDependenceInfo>(),
53635363
NumLifetimeDependencies};

0 commit comments

Comments
 (0)