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

This commit is contained in:
swift-ci
2021-07-28 20:53:04 -07:00
31 changed files with 649 additions and 816 deletions

View File

@@ -2470,6 +2470,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
ENCODE_VER_TUPLE(Deprecated, theAttr->Deprecated)
ENCODE_VER_TUPLE(Obsoleted, theAttr->Obsoleted)
auto renameDeclID = S.addDeclRef(theAttr->RenameDecl);
llvm::SmallString<32> blob;
blob.append(theAttr->Message);
blob.append(theAttr->Rename);
@@ -2484,6 +2485,7 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
LIST_VER_TUPLE_PIECES(Deprecated),
LIST_VER_TUPLE_PIECES(Obsoleted),
static_cast<unsigned>(theAttr->Platform),
renameDeclID,
theAttr->Message.size(),
theAttr->Rename.size(),
blob);
@@ -2662,21 +2664,6 @@ class Serializer::DeclSerializer : public DeclVisitor<DeclSerializer> {
origDeclID, paramIndicesVector);
return;
}
case DAK_CompletionHandlerAsync: {
auto *attr = cast<CompletionHandlerAsyncAttr>(DA);
auto abbrCode =
S.DeclTypeAbbrCodes[CompletionHandlerAsyncDeclAttrLayout::Code];
assert(attr->AsyncFunctionDecl &&
"Serializing unresolved completion handler async function decl");
auto asyncFuncDeclID = S.addDeclRef(attr->AsyncFunctionDecl);
CompletionHandlerAsyncDeclAttrLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode, attr->isImplicit(),
attr->CompletionHandlerIndex, asyncFuncDeclID);
return;
}
}
}