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

Remove Value requirement Add GenericTypeParamKind

Browse Source
This commit is contained in:
Alejandro Alonso
2024-08-03 22:08:11 -07:00
parent 0df42e9841
commit f4f60f4344
100 changed files with 834 additions and 1073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/Serialization/Serialization.cpp
View File

@@ -1497,6 +1497,20 @@ static uint8_t getRawStableRequirementKind(RequirementKind kind) {
CASE(Superclass)
CASE(SameType)
CASE(Layout)
}
#undef CASE
llvm_unreachable("Unhandled RequirementKind in switch.");
}
static uint8_t getRawStableGenericParamKind(GenericTypeParamKind kind) {
#define CASE(KIND) \
case GenericTypeParamKind::KIND: \
return (uint8_t)serialization::GenericParamKind::KIND;
switch (kind) {
CASE(Type)
CASE(Pack)
CASE(Value)
}
#undef CASE
@@ -4185,9 +4199,9 @@ public:
GenericTypeParamDeclLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode,
S.addDeclBaseNameRef(genericParam->getName()),
genericParam->isImplicit(), genericParam->isParameterPack(),
genericParam->isValue(), genericParam->getDepth(),
genericParam->getIndex(), genericParam->isOpaqueType());
genericParam->isImplicit(),
getRawStableGenericParamKind(genericParam->getParamKind()),
genericParam->getDepth(), genericParam->getIndex());
}
void visitAssociatedTypeDecl(const AssociatedTypeDecl *assocType) {
@@ -5558,6 +5572,8 @@ public:
unsigned abbrCode = S.DeclTypeAbbrCodes[GenericTypeParamTypeLayout::Code];
DeclID declIDOrDepth;
unsigned indexPlusOne;
uint8_t paramKind = getRawStableGenericParamKind(genericParam->getParamKind());
TypeID valueTypeID;
if (genericParam->getDecl() &&
!(genericParam->getDecl()->getDeclContext()->isModuleScopeContext() &&
S.isDeclXRef(genericParam->getDecl()))) {
@@ -5567,10 +5583,14 @@ public:
declIDOrDepth = genericParam->getDepth();
indexPlusOne = genericParam->getIndex() + 1;
}
if (auto valueType = genericParam->getValueType()) {
valueTypeID = S.addTypeRef(valueType);
}
GenericTypeParamTypeLayout::emitRecord(S.Out, S.ScratchRecord, abbrCode,
genericParam->isParameterPack(),
genericParam->isValue(),
declIDOrDepth, indexPlusOne);
paramKind, declIDOrDepth,
indexPlusOne, valueTypeID);
}
void visitDependentMemberType(const DependentMemberType *dependent) {