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

[AST/Serialization] Add a string for the generic requirements "as written" in the module file, to use it for

Browse Source 
the printed interface.

Previously we printed the typechecked and uniqued requirements and the result was non-sensical.
Long-term the requirements will be preserved in a better form but for now print the requirements
and serialize them.

rdar://19963093

Swift SVN r27680
This commit is contained in:
Argyrios Kyrtzidis
2015-04-24 06:11:09 +00:00
parent cf4c23b9cb
commit f9150a58b5
7 changed files with 75 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Serialization/Serialization.cpp
View File

@@ -900,25 +900,13 @@ void Serializer::writeRequirements(ArrayRef<Requirement> requirements) {
return;
auto reqAbbrCode = DeclTypeAbbrCodes[GenericRequirementLayout::Code];
for (const auto &req : requirements) { {
switch (req.getKind()) {
case RequirementKind::Conformance:
case RequirementKind::SameType:
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, reqAbbrCode,
getRawStableRequirementKind(req.getKind()),
addTypeRef(req.getFirstType()),
addTypeRef(req.getSecondType()));
break;
case RequirementKind::WitnessMarker:
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, reqAbbrCode,
getRawStableRequirementKind(req.getKind()),
llvm::makeArrayRef(addTypeRef(req.getFirstType())));
break;
}
}
for (const auto &req : requirements) {
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, reqAbbrCode,
getRawStableRequirementKind(req.getKind()),
addTypeRef(req.getFirstType()),
addTypeRef(req.getSecondType()),
StringRef());
}
}
@@ -945,21 +933,27 @@ bool Serializer::writeGenericParams(const GenericParamList *genericParams,
}
abbrCode = abbrCodes[GenericRequirementLayout::Code];
SmallString<64> ReqStr;
for (auto next : genericParams->getRequirements()) {
ReqStr.clear();
llvm::raw_svector_ostream ReqOS(ReqStr);
next.printAsWritten(ReqOS);
switch (next.getKind()) {
case RequirementKind::Conformance:
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, abbrCode,
GenericRequirementKind::Conformance,
addTypeRef(next.getSubject()),
addTypeRef(next.getConstraint()));
addTypeRef(next.getConstraint()),
ReqOS.str());
break;
case RequirementKind::SameType:
GenericRequirementLayout::emitRecord(
Out, ScratchRecord, abbrCode,
GenericRequirementKind::SameType,
addTypeRef(next.getFirstType()),
addTypeRef(next.getSecondType()));
addTypeRef(next.getSecondType()),
ReqOS.str());
break;
case RequirementKind::WitnessMarker:
llvm_unreachable("Can't show up in requirement representations");