commit 400bb13cded9fbf8b902447ec267b8318b207dc4
author Slava Pestov <sviatoslav.pestov@gmail.com> Wed Mar 01 10:44:08 2017 -0800
committer GitHub <noreply@github.com> Wed Mar 01 10:44:08 2017 -0800
tree ce93c6c9aeabd3ca4c8dd2f7c937a517411915e6
parent ba6ad0d8a725e26895557330bbc790f82425133e
parent 7c844fca9ffe6c55d4f2f3fdbc32e54cc424c603

Merge pull request #7844 from slavapestov/one-last-cleanup

SILOptimizer: Use the SubstitutionMap form of substGenericArgs()

lib/SILOptimizer/Utils/Generics.cpp

diff --git a/lib/SILOptimizer/Utils/Generics.cpp b/lib/SILOptimizer/Utils/Generics.cpp
index 3c12577..2adfd48 100644
--- a/lib/SILOptimizer/Utils/Generics.cpp
+++ b/lib/SILOptimizer/Utils/Generics.cpp
@@ -213,9 +213,7 @@
   auto OrigFnTy = OrigF->getLoweredFunctionType();
 
   // First substitute concrete types into the existing function type.
-  auto FnTy = OrigFnTy->substGenericArgs(
-      M, QuerySubstitutionMap{SubstMap},
-        LookUpConformanceInSubstitutionMap(SubstMap));
+  auto FnTy = OrigFnTy->substGenericArgs(M, SubstMap);
 
   if ((SpecializedGenericSig &&
        SpecializedGenericSig->areAllParamsConcrete()) ||