averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[NFC] Rename 'baseFoo' to 'extendedTypeFoo' in (de)serialization.

Browse Source
This commit is contained in:
Varun Gandhi
2019-09-03 14:52:55 -07:00
parent 99c65211e6
commit b9dd9f78ed
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/Deserialization.cpp
View File

@@ -3688,14 +3688,14 @@ public:
Expected<Decl *> deserializeExtension(ArrayRef<uint64_t> scratch,
StringRef blobData) {
TypeID baseID;
TypeID extendedTypeID;
DeclContextID contextID;
bool isImplicit;
GenericSignatureID genericEnvID;
unsigned numConformances, numInherited;
ArrayRef<uint64_t> inheritedAndDependencyIDs;
decls_block::ExtensionLayout::readRecord(scratch, baseID, contextID,
decls_block::ExtensionLayout::readRecord(scratch, extendedTypeID, contextID,
isImplicit, genericEnvID,
numConformances, numInherited,
inheritedAndDependencyIDs);
@@ -3732,9 +3732,9 @@ public:
MF.configureGenericEnvironment(extension, genericEnvID);
auto baseTy = MF.getType(baseID);
auto extendedType = MF.getType(extendedTypeID);
ctx.evaluator.cacheOutput(ExtendedTypeRequest{extension},
std::move(baseTy));
std::move(extendedType));
auto nominal = extension->getExtendedNominal();
if (isImplicit)