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
2022-07-20 19:14:34 -07:00
parent e541a741eb 436b75b272
commit 5706f48a31
13 changed files with 141 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Serialization/Serialization.cpp
View File

@@ -3941,17 +3941,20 @@ public:
S.DeclTypeAbbrCodes[ConditionalSubstitutionLayout::Code];
for (const auto *subs :
opaqueDecl->getConditionallyAvailableSubstitutions().drop_back()) {
SmallVector<IdentifierID, 4> conditions;
for (const auto &condition : subs->getAvailability()) {
auto lowerEndpoint = condition.getLowerEndpoint();
conditions.push_back(
S.addUniquedStringRef(lowerEndpoint.getAsString()));
}
ConditionalSubstitutionLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode,
S.addSubstitutionMapRef(subs->getSubstitutions()), conditions);
S.addSubstitutionMapRef(subs->getSubstitutions()));
unsigned condAbbrCode =
S.DeclTypeAbbrCodes[ConditionalSubstitutionConditionLayout::Code];
for (const auto &condition : subs->getAvailability()) {
ENCODE_VER_TUPLE(osVersion, llvm::Optional<llvm::VersionTuple>(
condition.first.getLowerEndpoint()));
ConditionalSubstitutionConditionLayout::emitRecord(
S.Out, S.ScratchRecord, condAbbrCode,
/*isUnavailable=*/condition.second,
LIST_VER_TUPLE_PIECES(osVersion));
}
}
}
}
@@ -5130,6 +5133,7 @@ void Serializer::writeAllDeclsAndTypes() {
registerDeclTypeAbbr<XRefLayout>();
registerDeclTypeAbbr<ConditionalSubstitutionLayout>();
registerDeclTypeAbbr<ConditionalSubstitutionConditionLayout>();
#define DECL_ATTR(X, NAME, ...) \
registerDeclTypeAbbr<NAME##DeclAttrLayout>();