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

Serialization: Remove unused mapConformanceOutOfContext() / mapConformanceRefIntoContext() path

Browse Source
This commit is contained in:
Slava Pestov
2023-04-18 22:46:15 -04:00
parent 1e26137379
commit 493494f42f
4 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Serialization/Serialization.cpp
View File

@@ -1678,20 +1678,17 @@ void Serializer::writeLocalNormalProtocolConformance(
}
serialization::ProtocolConformanceID
Serializer::addConformanceRef(ProtocolConformance *conformance,
GenericEnvironment *genericEnv) {
return addConformanceRef(ProtocolConformanceRef(conformance), genericEnv);
Serializer::addConformanceRef(ProtocolConformance *conformance) {
return addConformanceRef(ProtocolConformanceRef(conformance));
}
serialization::ProtocolConformanceID
Serializer::addConformanceRef(PackConformance *conformance,
GenericEnvironment *genericEnv) {
return addConformanceRef(ProtocolConformanceRef(conformance), genericEnv);
Serializer::addConformanceRef(PackConformance *conformance) {
return addConformanceRef(ProtocolConformanceRef(conformance));
}
serialization::ProtocolConformanceID
Serializer::addConformanceRef(ProtocolConformanceRef ref,
GenericEnvironment *genericEnv) {
Serializer::addConformanceRef(ProtocolConformanceRef ref) {
if (ref.isInvalid()) {
return 0;
}
@@ -1705,13 +1702,6 @@ Serializer::addConformanceRef(ProtocolConformanceRef ref,
if (ref.isConcrete()) {
auto conformance = ref.getConcrete();
if (genericEnv && conformance->getType()->hasArchetype()) {
ref = ref.mapConformanceOutOfContext();
assert(!ref.isInvalid() && !ref.isAbstract());
conformance = ref.getConcrete();
}
auto rawID = ConformancesToSerialize.addRef(conformance);
return ((rawID << SerializedProtocolConformanceKind::Shift) |
SerializedProtocolConformanceKind::Concrete);