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:
Bob Wilson
2017-01-12 15:58:19 -08:00
parent 221190f9dc 99080b4939
commit c765d5e3a5
297 changed files with 4847 additions and 1684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/Serialization.cpp
View File

@@ -968,6 +968,7 @@ static uint8_t getRawStableRequirementKind(RequirementKind kind) {
CASE(Conformance)
CASE(Superclass)
CASE(SameType)
CASE(Layout)
}
#undef CASE
@@ -983,11 +984,14 @@ void Serializer::writeGenericRequirements(ArrayRef<Requirement> requirements,
auto reqAbbrCode = abbrCodes[GenericRequirementLayout::Code];
for (const auto &req : requirements) {
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, reqAbbrCode,
getRawStableRequirementKind(req.getKind()),
addTypeRef(req.getFirstType()),
addTypeRef(req.getSecondType()));
if (req.getKind() != RequirementKind::Layout)
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, reqAbbrCode,
getRawStableRequirementKind(req.getKind()),
addTypeRef(req.getFirstType()), addTypeRef(req.getSecondType()));
else {
// TODO: write layout requirement here.
}
}
}
@@ -2903,7 +2907,6 @@ static uint8_t getRawStableParameterConvention(swift::ParameterConvention pc) {
SIMPLE_CASE(ParameterConvention, Direct_Owned)
SIMPLE_CASE(ParameterConvention, Direct_Unowned)
SIMPLE_CASE(ParameterConvention, Direct_Guaranteed)
SIMPLE_CASE(ParameterConvention, Direct_Deallocating)
}
llvm_unreachable("bad parameter convention kind");
}