Merge rewrite SILCombiner::propagateConcreteTypeOfInitExistential onto 4.2.

Author: atrick

include/swift/SILOptimizer/Utils/Existential.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_SILOPTIMIZER_UTILS_EXISTENTIAL_H
 #define SWIFT_SILOPTIMIZER_UTILS_EXISTENTIAL_H
 
+#include "swift/AST/SubstitutionMap.h"
 #include "swift/SIL/SILInstruction.h"
 
 namespace swift {

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -725,34 +725,40 @@ SILCombiner::createApplyWithConcreteType(FullApplySite Apply,
 
   // Form a new set of substitutions where Self is
   // replaced by a concrete type.
-  SubstitutionMap OrigCallSubs = Apply.getSubstitutionMap();
+  auto OrigCallSubs =
+    Apply.getOrigCalleeType()->getGenericSignature()->getSubstitutionMap(
+      Apply.getSubstitutions());
   SubstitutionMap NewCallSubs = OrigCallSubs.subst(
       [&](SubstitutableType *type) -> Type {
         if (type == CEI.OpenedArchetype)
           return CEI.ConcreteType;
         return type;
       },
       [&](CanType origTy, Type substTy,
-          ProtocolDecl *proto) -> Optional<ProtocolConformanceRef> {
+          ProtocolType *proto) -> Optional<ProtocolConformanceRef> {
         if (origTy->isEqual(CEI.OpenedArchetype)) {
           assert(substTy->isEqual(CEI.ConcreteType));
           // Do a conformance lookup on this witness requirement using the
           // existential's conformances. The witness requirement may be a base
           // type of the existential's requirements.
-          return CEI.lookupExistentialConformance(proto).getValue();
+          return CEI.lookupExistentialConformance(proto->getDecl()).getValue();
         }
-        return ProtocolConformanceRef(proto);
+        return ProtocolConformanceRef(proto->getDecl());
       });
 
+  SmallVector<Substitution, 8> Substitutions;
+  Apply.getOrigCalleeType()->getGenericSignature()->getSubstitutions(
+    NewCallSubs, Substitutions);
+
   SILBuilderWithScope ApplyBuilder(Apply.getInstruction(), BuilderCtx);
   FullApplySite NewApply;
   if (auto *TAI = dyn_cast<TryApplyInst>(Apply))
     NewApply = ApplyBuilder.createTryApply(
-        Apply.getLoc(), Apply.getCallee(), NewCallSubs, NewArgs,
+        Apply.getLoc(), Apply.getCallee(), Substitutions, NewArgs,
         TAI->getNormalBB(), TAI->getErrorBB());
   else
     NewApply = ApplyBuilder.createApply(
-        Apply.getLoc(), Apply.getCallee(), NewCallSubs, NewArgs,
+        Apply.getLoc(), Apply.getCallee(), Substitutions, NewArgs,
         cast<ApplyInst>(Apply)->isNonThrowing());
 
   if (auto NewAI = dyn_cast<ApplyInst>(NewApply))
@@ -825,7 +831,7 @@ SILCombiner::propagateConcreteTypeOfInitExistential(FullApplySite Apply,
     auto *NewWMI = WMIBuilder.createWitnessMethod(
         WMI->getLoc(), CEI.ConcreteType, SelfConformance, WMI->getMember(),
         WMI->getType());
-    NewWMI->dump();
+
     // Replace only uses of the witness_method in the apply that was analyzed by
     // ConcreteExistentialInfo.
     MutableArrayRef<Operand> Operands =

lib/SILOptimizer/Utils/Existential.cpp

@@ -240,8 +240,9 @@ ConcreteExistentialInfo::ConcreteExistentialInfo(Operand &openedUse) {
   CanGenericSignature ExistentialSig =
       M.getASTContext().getExistentialSignature(ExistentialType,
                                                 M.getSwiftModule());
-  ExistentialSubs = SubstitutionMap::get(ExistentialSig, {ConcreteType},
-                                         ExistentialConformances);
+  ExistentialSubs = ExistentialSig->getSubstitutionMap(
+    {Substitution(ConcreteType, ExistentialConformances)});
+
   // If the concrete type is another existential, we're "forwarding" an
   // opened existential type, so we must keep track of the original
   // defining instruction.

test/SILOptimizer/sil_combine_concrete_existential.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -enable-objc-interop -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -sil-combine | %FileCheck %s
+// RUN: %target-sil-opt -assume-parsing-unqualified-ownership-sil -enable-sil-verify-all %s -sil-combine | %FileCheck %s
 
 // These tests exercise the same SILCombine optimization as
 // existential_type_propagation.sil, but cover additional corner