@@ -2386,7 +2386,7 @@ class ParameterTypeFlags {
2386
2386
Specifier = 7 << SpecifierShift,
2387
2387
NoDerivative = 1 << 6 ,
2388
2388
Isolated = 1 << 7 ,
2389
- CompileTimeConst = 1 << 8,
2389
+ CompileTimeLiteral = 1 << 8 ,
2390
2390
Sending = 1 << 9 ,
2391
2391
Addressable = 1 << 10 ,
2392
2392
NumBits = 11
@@ -2404,20 +2404,20 @@ class ParameterTypeFlags {
2404
2404
2405
2405
ParameterTypeFlags (bool variadic, bool autoclosure, bool nonEphemeral,
2406
2406
ParamSpecifier specifier, bool isolated, bool noDerivative,
2407
- bool compileTimeConst , bool isSending, bool isAddressable)
2407
+ bool compileTimeLiteral , bool isSending, bool isAddressable)
2408
2408
: value((variadic ? Variadic : 0 ) | (autoclosure ? AutoClosure : 0 ) |
2409
2409
(nonEphemeral ? NonEphemeral : 0 ) |
2410
2410
uint8_t (specifier) << SpecifierShift | (isolated ? Isolated : 0 ) |
2411
2411
(noDerivative ? NoDerivative : 0 ) |
2412
- (compileTimeConst ? CompileTimeConst : 0) |
2412
+ (compileTimeLiteral ? CompileTimeLiteral : 0 ) |
2413
2413
(isSending ? Sending : 0 ) |
2414
2414
(isAddressable ? Addressable : 0 )) {}
2415
2415
2416
2416
// / Create one from what's present in the parameter type
2417
2417
inline static ParameterTypeFlags
2418
2418
fromParameterType (Type paramTy, bool isVariadic, bool isAutoClosure,
2419
2419
bool isNonEphemeral, ParamSpecifier ownership,
2420
- bool isolated, bool isNoDerivative, bool compileTimeConst ,
2420
+ bool isolated, bool isNoDerivative, bool compileTimeLiteral ,
2421
2421
bool isSending, bool isAddressable);
2422
2422
2423
2423
bool isNone () const { return !value; }
@@ -2428,7 +2428,7 @@ class ParameterTypeFlags {
2428
2428
bool isShared () const { return getValueOwnership () == ValueOwnership::Shared;}
2429
2429
bool isOwned () const { return getValueOwnership () == ValueOwnership::Owned; }
2430
2430
bool isIsolated () const { return value.contains (Isolated); }
2431
- bool isCompileTimeConst () const { return value.contains(CompileTimeConst ); }
2431
+ bool isCompileTimeLiteral () const { return value.contains (CompileTimeLiteral ); }
2432
2432
bool isNoDerivative () const { return value.contains (NoDerivative); }
2433
2433
bool isSending () const { return value.contains (Sending); }
2434
2434
bool isAddressable () const { return value.contains (Addressable); }
@@ -2450,9 +2450,9 @@ class ParameterTypeFlags {
2450
2450
: ParamSpecifier::Default);
2451
2451
}
2452
2452
2453
- ParameterTypeFlags withCompileTimeConst (bool isConst) const {
2454
- return ParameterTypeFlags(isConst ? value | ParameterTypeFlags::CompileTimeConst
2455
- : value - ParameterTypeFlags::CompileTimeConst );
2453
+ ParameterTypeFlags withCompileTimeLiteral (bool isConst) const {
2454
+ return ParameterTypeFlags (isConst ? value | ParameterTypeFlags::CompileTimeLiteral
2455
+ : value - ParameterTypeFlags::CompileTimeLiteral );
2456
2456
}
2457
2457
2458
2458
ParameterTypeFlags withShared (bool isShared) const {
@@ -2598,7 +2598,7 @@ class YieldTypeFlags {
2598
2598
/* autoclosure*/ false ,
2599
2599
/* nonEphemeral*/ false , getOwnershipSpecifier (),
2600
2600
/* isolated*/ false , /* noDerivative*/ false ,
2601
- /*compileTimeConst */ false,
2601
+ /* compileTimeLiteral */ false ,
2602
2602
/* is sending*/ false ,
2603
2603
/* is addressable*/ false );
2604
2604
}
@@ -3391,8 +3391,8 @@ class AnyFunctionType : public TypeBase {
3391
3391
// / Whether or not the parameter is 'sending'.
3392
3392
bool isSending () const { return Flags.isSending (); }
3393
3393
3394
- /// Whether the parameter is 'isCompileTimeConst '.
3395
- bool isCompileTimeConst () const { return Flags.isCompileTimeConst (); }
3394
+ // / Whether the parameter is 'isCompileTimeLiteral '.
3395
+ bool isCompileTimeLiteral () const { return Flags.isCompileTimeLiteral (); }
3396
3396
3397
3397
// / Whether the parameter is marked '@noDerivative'.
3398
3398
bool isNoDerivative () const { return Flags.isNoDerivative (); }
@@ -8077,7 +8077,7 @@ inline TupleTypeElt TupleTypeElt::getWithType(Type T) const {
8077
8077
inline ParameterTypeFlags ParameterTypeFlags::fromParameterType (
8078
8078
Type paramTy, bool isVariadic, bool isAutoClosure, bool isNonEphemeral,
8079
8079
ParamSpecifier ownership, bool isolated, bool isNoDerivative,
8080
- bool compileTimeConst , bool isSending, bool isAddressable) {
8080
+ bool compileTimeLiteral , bool isSending, bool isAddressable) {
8081
8081
// FIXME(Remove InOut): The last caller that needs this is argument
8082
8082
// decomposition. Start by enabling the assertion there and fixing up those
8083
8083
// callers, then remove this, then remove
@@ -8088,7 +8088,7 @@ inline ParameterTypeFlags ParameterTypeFlags::fromParameterType(
8088
8088
ownership = ParamSpecifier::InOut;
8089
8089
}
8090
8090
return {isVariadic, isAutoClosure, isNonEphemeral, ownership,
8091
- isolated, isNoDerivative, compileTimeConst , isSending,
8091
+ isolated, isNoDerivative, compileTimeLiteral , isSending,
8092
8092
isAddressable};
8093
8093
}
8094
8094
0 commit comments