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/master' into master-next

Browse Source
This commit is contained in:
swift-ci
2018-07-21 13:49:33 -07:00
parent ecc51ae18f 19104c0957
commit b4bae42909
21 changed files with 239 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/Serialization.cpp
View File

@@ -3240,7 +3240,7 @@ void Serializer::writeDecl(const Decl *D) {
writeGenericParams(fn->getGenericParams());
// Write the body parameters.
writeParameterList(fn->getParameterLists().back());
writeParameterList(fn->getParameters());
if (auto errorConvention = fn->getForeignErrorConvention())
writeForeignErrorConvention(*errorConvention);
@@ -3297,7 +3297,7 @@ void Serializer::writeDecl(const Decl *D) {
writeGenericParams(fn->getGenericParams());
// Write the body parameters.
writeParameterList(fn->getParameterLists().back());
writeParameterList(fn->getParameters());
if (auto errorConvention = fn->getForeignErrorConvention())
writeForeignErrorConvention(*errorConvention);
@@ -3451,9 +3451,7 @@ void Serializer::writeDecl(const Decl *D) {
nameComponentsAndDependencies);
writeGenericParams(ctor->getGenericParams());
assert(ctor->getParameterLists().size() == 2);
writeParameterList(ctor->getParameterLists().back());
writeParameterList(ctor->getParameters());
if (auto errorConvention = ctor->getForeignErrorConvention())
writeForeignErrorConvention(*errorConvention);