commit 57cc3ba44af0327e59d05b82da1c387036e298ef
author Slava Pestov <sviatoslav.pestov@gmail.com> Fri Sep 08 00:56:15 2017 -0700
committer GitHub <noreply@github.com> Fri Sep 08 00:56:15 2017 -0700
tree 38bda8c678a95a452d4dd3ee5a3073295c18561a
parent 2e22904c33d25deac20ccfe4da9ae84e5d8eb965
parent e7e5a21dce3bb196d2b9aeeafa44f0520517c66d

Merge pull request #11814 from slavapestov/irgen-remove-conformance-lookup

IRGen: Remove a hack that no longer seems necessary

lib/IRGen/GenProto.cpp

diff --git a/lib/IRGen/GenProto.cpp b/lib/IRGen/GenProto.cpp
index be7e5fc..7ddf897 100644
--- a/lib/IRGen/GenProto.cpp
+++ b/lib/IRGen/GenProto.cpp
@@ -2134,18 +2134,6 @@
     auto associatedConformance =
       sourceConformance.getAssociatedConformance(sourceType, association,
                                                  associatedRequirement);
-
-    // FIXME: this should be taken care of automatically by
-    // getAssociatedConformance.
-    if (!associatedConformance.isConcrete() &&
-        !isa<ArchetypeType>(associatedType)) {
-      if (auto concreteConf =
-            IGF.IGM.getSwiftModule()->lookupConformance(associatedType,
-                                                      associatedRequirement)) {
-        associatedConformance = *concreteConf;
-      }
-    }
-
     sourceKey.Kind =
       LocalTypeDataKind::forProtocolWitnessTable(associatedConformance);