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 branch 'main' into serial-fix-control-block

Browse Source
This commit is contained in:
Alexis Laferrière
2024-06-05 10:46:49 -07:00
committed by GitHub
parent 998a40aed2 2175abd4e9
commit ab6a7017d0
666 changed files with 19744 additions and 6806 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/Serialization.cpp
View File

@@ -1742,6 +1742,7 @@ void Serializer::writeASTBlockEntity(const SILLayout *layout) {
data);
}
// TODO: DON'T serialize the special conformance for DA-as_A
void Serializer::writeLocalNormalProtocolConformance(
NormalProtocolConformance *conformance) {
using namespace decls_block;
@@ -1866,7 +1867,7 @@ Serializer::writeASTBlockEntity(ProtocolConformance *conformance) {
if (!isDeclXRef(normal->getDeclContext()->getAsDecl())
&& !isa<ClangModuleUnit>(normal->getDeclContext()
->getModuleScopeContext())) {
writeLocalNormalProtocolConformance(normal);
writeLocalNormalProtocolConformance(normal);
} else {
// A conformance in a different module file.
unsigned abbrCode = DeclTypeAbbrCodes[ProtocolConformanceXrefLayout::Code];
@@ -1959,8 +1960,10 @@ Serializer::addConformanceRefs(ArrayRef<ProtocolConformanceRef> conformances) {
using namespace decls_block;
SmallVector<ProtocolConformanceID, 4> results;
for (auto conformance : conformances)
results.push_back(addConformanceRef(conformance));
for (auto conformance : conformances) {
auto id = addConformanceRef(conformance);
results.push_back(id);
}
return results;
}
@@ -1968,9 +1971,11 @@ SmallVector<ProtocolConformanceID, 4>
Serializer::addConformanceRefs(ArrayRef<ProtocolConformance*> conformances) {
using namespace decls_block;
SmallVector<ProtocolConformanceID, 4> results;
for (auto conformance : conformances)
for (auto conformance : conformances) {
results.push_back(addConformanceRef(conformance));
}
return results;
}
@@ -3345,7 +3350,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
RawLayoutDeclAttrLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode, attr->isImplicit(),
typeID, rawSize, rawAlign);
typeID, rawSize, rawAlign, attr->shouldMoveAsLikeType());
}
}
}