@@ -1343,9 +1343,9 @@ void TypeConverter::insert(TypeKey k, const TypeLowering *tl) {
1343
1343
1344
1344
// / Lower each of the elements of the substituted type according to
1345
1345
// / the abstraction pattern of the given original type.
1346
- static CanTupleType getLoweredTupleType (TypeConverter &tc,
1347
- AbstractionPattern origType,
1348
- CanTupleType substType) {
1346
+ static CanTupleType computeLoweredTupleType (TypeConverter &tc,
1347
+ AbstractionPattern origType,
1348
+ CanTupleType substType) {
1349
1349
assert (origType.matchesTuple (substType));
1350
1350
1351
1351
// Does the lowered tuple type differ from the substituted type in
@@ -1388,10 +1388,10 @@ static CanTupleType getLoweredTupleType(TypeConverter &tc,
1388
1388
return cast<TupleType>(CanType (TupleType::get (loweredElts, tc.Context )));
1389
1389
}
1390
1390
1391
- static CanType getLoweredOptionalType (TypeConverter &tc,
1392
- AbstractionPattern origType,
1393
- CanType substType,
1394
- CanType substObjectType) {
1391
+ static CanType computeLoweredOptionalType (TypeConverter &tc,
1392
+ AbstractionPattern origType,
1393
+ CanType substType,
1394
+ CanType substObjectType) {
1395
1395
assert (substType.getOptionalObjectType () == substObjectType);
1396
1396
1397
1397
CanType loweredObjectType =
@@ -1407,9 +1407,10 @@ static CanType getLoweredOptionalType(TypeConverter &tc,
1407
1407
return CanType (BoundGenericEnumType::get (optDecl, Type (), loweredObjectType));
1408
1408
}
1409
1409
1410
- static CanType getLoweredReferenceStorageType (TypeConverter &tc,
1411
- AbstractionPattern origType,
1412
- CanReferenceStorageType substType) {
1410
+ static CanType
1411
+ computeLoweredReferenceStorageType (TypeConverter &tc,
1412
+ AbstractionPattern origType,
1413
+ CanReferenceStorageType substType) {
1413
1414
CanType loweredReferentType =
1414
1415
tc.getLoweredType (origType.getReferenceStorageReferentType (),
1415
1416
substType.getReferentType ())
@@ -1445,7 +1446,7 @@ TypeConverter::getTypeLowering(AbstractionPattern origType,
1445
1446
1446
1447
// Lower the type.
1447
1448
CanType loweredSubstType =
1448
- getLoweredRValueType (origType, substType);
1449
+ computeLoweredRValueType (origType, substType);
1449
1450
1450
1451
// If that didn't change the type and the key is cacheable, there's no
1451
1452
// point in re-checking the table, so just construct a type lowering
@@ -1467,8 +1468,8 @@ TypeConverter::getTypeLowering(AbstractionPattern origType,
1467
1468
return lowering;
1468
1469
}
1469
1470
1470
- CanType TypeConverter::getLoweredRValueType (AbstractionPattern origType,
1471
- CanType substType) {
1471
+ CanType TypeConverter::computeLoweredRValueType (AbstractionPattern origType,
1472
+ CanType substType) {
1472
1473
assert (!substType->hasError () &&
1473
1474
" Error types should not appear in type-checked AST" );
1474
1475
@@ -1559,17 +1560,18 @@ CanType TypeConverter::getLoweredRValueType(AbstractionPattern origType,
1559
1560
1560
1561
// Lower tuple element types.
1561
1562
if (auto substTupleType = dyn_cast<TupleType>(substType)) {
1562
- return getLoweredTupleType (*this , origType, substTupleType);
1563
+ return computeLoweredTupleType (*this , origType, substTupleType);
1563
1564
}
1564
1565
1565
1566
// Lower the referent type of reference storage types.
1566
1567
if (auto substRefType = dyn_cast<ReferenceStorageType>(substType)) {
1567
- return getLoweredReferenceStorageType (*this , origType, substRefType);
1568
+ return computeLoweredReferenceStorageType (*this , origType, substRefType);
1568
1569
}
1569
1570
1570
1571
// Lower the object type of optional types.
1571
1572
if (auto substObjectType = substType.getOptionalObjectType ()) {
1572
- return getLoweredOptionalType (*this , origType, substType, substObjectType);
1573
+ return computeLoweredOptionalType (*this , origType,
1574
+ substType, substObjectType);
1573
1575
}
1574
1576
1575
1577
// The Swift type directly corresponds to the lowered type.
0 commit comments