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 rebranch

Browse Source 
Conflicts:
	lib/IRGen/IRGenDebugInfo.cpp
This commit is contained in:
Adrian Prantl
2021-01-29 16:17:10 -08:00
parent dbfc4dc329 3b77ce4e19
commit a9f05c8c30
72 changed files with 1396 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serialization/Serialization.cpp
View File

@@ -4393,7 +4393,7 @@ public:
unsigned abbrCode = S.DeclTypeAbbrCodes[SILFunctionTypeLayout::Code];
SILFunctionTypeLayout::emitRecord(
S.Out, S.ScratchRecord, abbrCode,
S.Out, S.ScratchRecord, abbrCode, fnTy->isConcurrent(),
fnTy->isAsync(), stableCoroutineKind, stableCalleeConvention,
stableRepresentation, fnTy->isPseudogeneric(), fnTy->isNoEscape(),
stableDiffKind, fnTy->hasErrorResult(), fnTy->getParameters().size(),