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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2023-08-30 10:14:24 -07:00
parent 7d6977246a 0dd315717b
commit f5817e64a3
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/Serialization/Serialization.cpp
View File

@@ -3259,6 +3259,18 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
}
}
size_t addConformances(const IterableDeclContext *declContext,
ConformanceLookupKind lookupKind,
SmallVectorImpl<TypeID> &data) {
size_t count = 0;
for (auto conformance : declContext->getLocalConformances(lookupKind)) {
data.push_back(S.addConformanceRef(conformance));
count++;
}
return count;
}
public:
/// Determine if \p decl is safe to deserialize when it's public
/// or otherwise needed by the client in normal builds, this should usually
@@ -3791,8 +3803,8 @@ public:
/// Add all of the inherited entries to the result vector.
///
/// \returns the number of entries added.
unsigned addInherited(ArrayRef<InheritedEntry> inheritedEntries,
SmallVectorImpl<TypeID> &result) {
size_t addInherited(ArrayRef<InheritedEntry> inheritedEntries,
SmallVectorImpl<TypeID> &result) {
for (const auto &inherited : inheritedEntries) {
assert(!inherited.getType() || !inherited.getType()->hasArchetype());
TypeID typeRef = S.addTypeRef(inherited.getType());
@@ -3825,13 +3837,9 @@ public:
// simpler user model to just always desugar extension types.
extendedType = extendedType->getCanonicalType();
auto conformances = extension->getLocalConformances(
ConformanceLookupKind::All);
SmallVector<TypeID, 8> data;
for (auto conformance : conformances)
data.push_back(S.addConformanceRef(conformance));
size_t numConformances =
addConformances(extension, ConformanceLookupKind::All, data);
size_t numInherited = addInherited(
extension->getInherited(), data);
@@ -3854,7 +3862,7 @@ public:
extension->isImplicit(),
S.addGenericSignatureRef(
extension->getGenericSignature()),
conformances.size(),
numConformances,
numInherited,
data);
@@ -4058,14 +4066,10 @@ public:
auto contextID = S.addDeclContextRef(theStruct->getDeclContext());
auto conformances = theStruct->getLocalConformances(
ConformanceLookupKind::All);
SmallVector<TypeID, 4> data;
for (auto conformance : conformances)
data.push_back(S.addConformanceRef(conformance));
unsigned numInherited = addInherited(theStruct->getInherited(), data);
size_t numConformances =
addConformances(theStruct, ConformanceLookupKind::All, data);
size_t numInherited = addInherited(theStruct->getInherited(), data);
swift::SmallSetVector<Type, 4> dependencyTypes;
for (Requirement req : theStruct->getGenericRequirements()) {
@@ -4087,7 +4091,7 @@ public:
S.addGenericSignatureRef(
theStruct->getGenericSignature()),
rawAccessLevel,
conformances.size(),
numConformances,
numInherited,
data);
@@ -4102,14 +4106,10 @@ public:
auto contextID = S.addDeclContextRef(theEnum->getDeclContext());
auto conformances = theEnum->getLocalConformances(
ConformanceLookupKind::All);
SmallVector<TypeID, 4> data;
for (auto conformance : conformances)
data.push_back(S.addConformanceRef(conformance));
unsigned numInherited = addInherited(theEnum->getInherited(), data);
size_t numConformances =
addConformances(theEnum, ConformanceLookupKind::All, data);
size_t numInherited = addInherited(theEnum->getInherited(), data);
swift::SmallSetVector<Type, 4> dependencyTypes;
for (const EnumElementDecl *nextElt : theEnum->getAllElements()) {
@@ -4144,7 +4144,7 @@ public:
theEnum->getGenericSignature()),
S.addTypeRef(theEnum->getRawType()),
rawAccessLevel,
conformances.size(),
numConformances,
numInherited,
data);
@@ -4159,14 +4159,10 @@ public:
auto contextID = S.addDeclContextRef(theClass->getDeclContext());
auto conformances = theClass->getLocalConformances(
ConformanceLookupKind::NonInherited);
SmallVector<TypeID, 4> data;
for (auto conformance : conformances)
data.push_back(S.addConformanceRef(conformance));
unsigned numInherited = addInherited(theClass->getInherited(), data);
size_t numConformances =
addConformances(theClass, ConformanceLookupKind::NonInherited, data);
size_t numInherited = addInherited(theClass->getInherited(), data);
swift::SmallSetVector<Type, 4> dependencyTypes;
if (theClass->hasSuperclass()) {
@@ -4203,7 +4199,7 @@ public:
theClass->getGenericSignature()),
S.addTypeRef(theClass->getSuperclass()),
rawAccessLevel,
conformances.size(),
numConformances,
numInherited,
data);