@@ -417,7 +417,7 @@ class alignas(1 << TypeAlignInBits) TypeBase
417
417
HasExtInfo : 1 ,
418
418
HasClangTypeInfo : 1 ,
419
419
HasThrownError : 1 ,
420
- HasLifetimeDependenceInfo : 1 ,
420
+ HasLifetimeDependencies : 1 ,
421
421
: NumPadBits,
422
422
NumParams : 16
423
423
);
@@ -3366,7 +3366,7 @@ class AnyFunctionType : public TypeBase {
3366
3366
Bits.AnyFunctionType .HasThrownError =
3367
3367
!Info.value ().getThrownError ().isNull ();
3368
3368
assert (!Bits.AnyFunctionType .HasThrownError || Info->isThrowing ());
3369
- Bits.AnyFunctionType .HasLifetimeDependenceInfo =
3369
+ Bits.AnyFunctionType .HasLifetimeDependencies =
3370
3370
!Info.value ().getLifetimeDependencies ().empty ();
3371
3371
// The use of both assert() and static_assert() is intentional.
3372
3372
assert (Bits.AnyFunctionType .ExtInfoBits == Info.value ().getBits () &&
@@ -3379,7 +3379,7 @@ class AnyFunctionType : public TypeBase {
3379
3379
Bits.AnyFunctionType .HasClangTypeInfo = false ;
3380
3380
Bits.AnyFunctionType .ExtInfoBits = 0 ;
3381
3381
Bits.AnyFunctionType .HasThrownError = false ;
3382
- Bits.AnyFunctionType .HasLifetimeDependenceInfo = false ;
3382
+ Bits.AnyFunctionType .HasLifetimeDependencies = false ;
3383
3383
}
3384
3384
Bits.AnyFunctionType .NumParams = NumParams;
3385
3385
assert (Bits.AnyFunctionType .NumParams == NumParams && " Params dropped!" );
@@ -3426,8 +3426,8 @@ class AnyFunctionType : public TypeBase {
3426
3426
return Bits.AnyFunctionType .HasThrownError ;
3427
3427
}
3428
3428
3429
- bool hasLifetimeDependenceInfo () const {
3430
- return Bits.AnyFunctionType .HasLifetimeDependenceInfo ;
3429
+ bool hasLifetimeDependencies () const {
3430
+ return Bits.AnyFunctionType .HasLifetimeDependencies ;
3431
3431
}
3432
3432
3433
3433
ClangTypeInfo getClangTypeInfo () const ;
@@ -3735,11 +3735,11 @@ class FunctionType final
3735
3735
}
3736
3736
3737
3737
size_t numTrailingObjects (OverloadToken<size_t >) const {
3738
- return hasLifetimeDependenceInfo () ? 1 : 0 ;
3738
+ return hasLifetimeDependencies () ? 1 : 0 ;
3739
3739
}
3740
3740
3741
3741
size_t numTrailingObjects (OverloadToken<LifetimeDependenceInfo>) const {
3742
- return hasLifetimeDependenceInfo () ? getNumLifetimeDependencies () : 0 ;
3742
+ return hasLifetimeDependencies () ? getNumLifetimeDependencies () : 0 ;
3743
3743
}
3744
3744
3745
3745
public:
@@ -3774,13 +3774,13 @@ class FunctionType final
3774
3774
}
3775
3775
3776
3776
inline size_t getNumLifetimeDependencies () const {
3777
- if (!hasLifetimeDependenceInfo ())
3777
+ if (!hasLifetimeDependencies ())
3778
3778
return 0 ;
3779
3779
return getTrailingObjects<size_t >()[0 ];
3780
3780
}
3781
3781
3782
3782
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies () const {
3783
- if (!hasLifetimeDependenceInfo ())
3783
+ if (!hasLifetimeDependencies ())
3784
3784
return std::nullopt;
3785
3785
return {getTrailingObjects<LifetimeDependenceInfo>(),
3786
3786
getNumLifetimeDependencies ()};
@@ -3905,11 +3905,11 @@ class GenericFunctionType final
3905
3905
}
3906
3906
3907
3907
size_t numTrailingObjects (OverloadToken<size_t >) const {
3908
- return hasLifetimeDependenceInfo () ? 1 : 0 ;
3908
+ return hasLifetimeDependencies () ? 1 : 0 ;
3909
3909
}
3910
3910
3911
3911
size_t numTrailingObjects (OverloadToken<LifetimeDependenceInfo>) const {
3912
- return hasLifetimeDependenceInfo () ? getNumLifetimeDependencies () : 0 ;
3912
+ return hasLifetimeDependencies () ? getNumLifetimeDependencies () : 0 ;
3913
3913
}
3914
3914
3915
3915
// / Construct a new generic function type.
@@ -3941,13 +3941,13 @@ class GenericFunctionType final
3941
3941
}
3942
3942
3943
3943
inline size_t getNumLifetimeDependencies () const {
3944
- if (!hasLifetimeDependenceInfo ())
3944
+ if (!hasLifetimeDependencies ())
3945
3945
return 0 ;
3946
3946
return getTrailingObjects<size_t >()[0 ];
3947
3947
}
3948
3948
3949
3949
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies () const {
3950
- if (!hasLifetimeDependenceInfo ())
3950
+ if (!hasLifetimeDependencies ())
3951
3951
return std::nullopt;
3952
3952
return {getTrailingObjects<LifetimeDependenceInfo>(),
3953
3953
getNumLifetimeDependencies ()};
@@ -5352,12 +5352,12 @@ class SILFunctionType final
5352
5352
5353
5353
ClangTypeInfo getClangTypeInfo () const ;
5354
5354
5355
- bool hasLifetimeDependenceInfo () const {
5355
+ bool hasLifetimeDependencies () const {
5356
5356
return NumLifetimeDependencies != 0 ;
5357
5357
}
5358
5358
5359
5359
ArrayRef<LifetimeDependenceInfo> getLifetimeDependencies () const {
5360
- if (!hasLifetimeDependenceInfo ())
5360
+ if (!hasLifetimeDependencies ())
5361
5361
return std::nullopt;
5362
5362
return {getTrailingObjects<LifetimeDependenceInfo>(),
5363
5363
NumLifetimeDependencies};
0 commit comments