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
2019-10-30 07:49:45 -07:00
parent e981f7fa0d 5f3b1da22a
commit 2689ff9343
85 changed files with 831 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Serialization/Serialization.cpp
View File

@@ -3981,8 +3981,8 @@ public:
fnTy->getNumYields(), fnTy->getNumResults(),
S.addGenericSignatureRef(sig), variableData);
if (auto conformance = fnTy->getWitnessMethodConformanceOrNone())
S.writeConformance(*conformance, S.DeclTypeAbbrCodes);
if (auto conformance = fnTy->getWitnessMethodConformanceOrInvalid())
S.writeConformance(conformance, S.DeclTypeAbbrCodes);
}
void visitArraySliceType(const ArraySliceType *sliceTy) {