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

Merge remote-tracking branch 'origin/main' into manual-main-merge

Browse Source 
Conflicts:
  - `lib/Driver/ToolChains.cpp` conflicting with the `addAllArgs` rename
    for multiple options
This commit is contained in:
Ben Barham
2024-09-16 13:53:18 -07:00
parent 0358c9eab7 0bd4e4e921
commit a7b50f357f
487 changed files with 8947 additions and 6026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Serialization/Serialization.cpp
View File

@@ -1126,6 +1126,13 @@ void Serializer::writeHeader() {
ExportAs.emit(ScratchRecord, M->getExportAsName().str());
}
Identifier publicModuleName =
M->getPublicModuleName(/*onlyIfImported=*/false);
if (publicModuleName != M->getName()) {
options_block::PublicModuleNameLayout PublicModuleName(Out);
PublicModuleName.emit(ScratchRecord, publicModuleName.str());
}
if (M->isConcurrencyChecked()) {
options_block::IsConcurrencyCheckedLayout IsConcurrencyChecked(Out);
IsConcurrencyChecked.emit(ScratchRecord);
@@ -3375,6 +3382,10 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
RawLayoutDeclAttrLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode, attr->isImplicit(),
typeID, countID, rawSize, rawAlign, attr->shouldMoveAsLikeType());
return;
}
case DeclAttrKind::Lifetime: {
return;
}
}
}