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

Author: slavapestov

lib/Serialization/Deserialization.cpp

@@ -825,17 +825,15 @@ ProtocolConformanceDeserializer::read(
 }
 
 ProtocolConformanceRef
-ModuleFile::getConformance(ProtocolConformanceID id,
-                           GenericEnvironment *genericEnv) {
-  auto conformance = getConformanceChecked(id, genericEnv);
+ModuleFile::getConformance(ProtocolConformanceID id) {
+  auto conformance = getConformanceChecked(id);
   if (!conformance)
     fatal(conformance.takeError());
   return conformance.get();
 }
 
 Expected<ProtocolConformanceRef>
-ModuleFile::getConformanceChecked(ProtocolConformanceID conformanceID,
-                                  GenericEnvironment *genericEnv) {
+ModuleFile::getConformanceChecked(ProtocolConformanceID conformanceID) {
   using namespace decls_block;
 
   if (conformanceID == 0) return ProtocolConformanceRef::forInvalid();
@@ -868,14 +866,7 @@ ModuleFile::getConformanceChecked(ProtocolConformanceID conformanceID,
       conformanceOrOffset = result.get();
     }
     auto conformance = conformanceOrOffset.get();
-    if (!genericEnv || !conformance->getType()->hasTypeParameter())
-      return ProtocolConformanceRef(conformance);
-
-    // If we have a generic environment, map the conformance into context.
-    auto mappedConformance =
-      genericEnv->mapConformanceRefIntoContext(conformance->getType(),
-                                       ProtocolConformanceRef(conformance));
-    return mappedConformance.second;
+    return ProtocolConformanceRef(conformance);
   }
 
   case SerializedProtocolConformanceKind::Pack: {

lib/Serialization/ModuleFile.h

@@ -989,13 +989,11 @@ class ModuleFile
 
   /// Returns the protocol conformance for the given ID.
   ProtocolConformanceRef
-  getConformance(serialization::ProtocolConformanceID id,
-                 GenericEnvironment *genericEnv = nullptr);
+  getConformance(serialization::ProtocolConformanceID id);
 
   /// Returns the protocol conformance for the given ID.
   llvm::Expected<ProtocolConformanceRef>
-  getConformanceChecked(serialization::ProtocolConformanceID id,
-                        GenericEnvironment *genericEnv = nullptr);
+  getConformanceChecked(serialization::ProtocolConformanceID id);
 
   /// Read a SILLayout from the given cursor.
   SILLayout *readSILLayout(llvm::BitstreamCursor &Cursor);

lib/Serialization/Serialization.cpp

@@ -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);

lib/Serialization/Serialization.h

@@ -511,18 +511,10 @@ class Serializer : public SerializerBase {
   /// The protocol conformance will be scheduled for serialization
   /// if necessary.
   ///
-  /// \param genericEnv When provided, the generic environment that describes
-  /// the archetypes within the substitutions. The replacement types within
-  /// the substitution will be mapped out of the generic environment before
-  /// being written.
-  ///
   /// \returns The ID for the given conformance in this module.
-  ProtocolConformanceID addConformanceRef(ProtocolConformance *conformance,
-                                   GenericEnvironment *genericEnv = nullptr);
-  ProtocolConformanceID addConformanceRef(PackConformance *conformance,
-                                   GenericEnvironment *genericEnv = nullptr);
-  ProtocolConformanceID addConformanceRef(ProtocolConformanceRef conformance,
-                                   GenericEnvironment *genericEnv = nullptr);
+  ProtocolConformanceID addConformanceRef(ProtocolConformance *conformance);
+  ProtocolConformanceID addConformanceRef(PackConformance *conformance);
+  ProtocolConformanceID addConformanceRef(ProtocolConformanceRef conformance);
 
   SmallVector<ProtocolConformanceID, 4>
   addConformanceRefs(ArrayRef<ProtocolConformanceRef> conformances);