Merge pull request #28083 from eeckstein/fix-silcombine

SILCombine: fix a wrong dealloc_stack ordering when propagating concrete types of apply arguments.

Author: eeckstein

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -1311,7 +1311,7 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
     // deallocate the temporary copy.
     SILBuilder cleanupBuilder(cleanupPos, NewApply.getDebugScope(), BuilderCtx);
     auto cleanupLoc = RegularLocation::getAutoGeneratedLocation();
-    for (ConcreteArgumentCopy &argCopy : concreteArgCopies) {
+    for (ConcreteArgumentCopy &argCopy : llvm::reverse(concreteArgCopies)) {
       cleanupBuilder.createDestroyAddr(cleanupLoc, argCopy.origArg);
       cleanupBuilder.createDeallocStack(cleanupLoc,
                                         argCopy.tempArgCopy->getDest());

test/SILOptimizer/sil_combine_concrete_existential.sil

@@ -570,3 +570,48 @@ bb0(%0 : $C):
   %9 = tuple ()
   return %9 : $()
 }
+
+protocol P1 { }
+protocol P2 { }
+protocol P3 { }
+
+sil @callee : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2 where τ_0_0 : P1, τ_0_1 : P2, τ_0_2 : P3> (@in τ_0_0, @in τ_0_2, @in τ_0_1) -> ()
+
+// Check that the deallocations are created in the right order and the SILVerifier does not complain.
+
+// CHECK-LABEL: sil @test_multiple_propagated_args
+// CHECK-NOT: open_existential_addr
+// CHECK-LABEL: } // end sil function 'test_multiple_propagated_args'
+sil @test_multiple_propagated_args : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2 where τ_0_0 : P1, τ_0_1 : P2, τ_0_2 : P3> (@in τ_0_0, @in τ_0_2, @in τ_0_1) -> () {
+bb0(%0 : $*τ_0_0, %1 : $*τ_0_2, %2 : $*τ_0_1):
+  %5 = alloc_stack $P1
+  %6 = init_existential_addr %5 : $*P1, $τ_0_0
+  copy_addr [take] %0 to [initialization] %6 : $*τ_0_0
+  %8 = alloc_stack $P3
+  %9 = init_existential_addr %8 : $*P3, $τ_0_2
+  copy_addr [take] %1 to [initialization] %9 : $*τ_0_2
+  %11 = alloc_stack $P2
+  %12 = init_existential_addr %11 : $*P2, $τ_0_1
+  copy_addr [take] %2 to [initialization] %12 : $*τ_0_1
+  %15 = function_ref @callee : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2 where τ_0_0 : P1, τ_0_1 : P2, τ_0_2 : P3> (@in τ_0_0, @in τ_0_2, @in τ_0_1) -> ()
+  %16 = open_existential_addr mutable_access %5 : $*P1 to $*@opened("76D54B80-FF66-11E9-B604-8C8590A6A134") P1
+  %17 = alloc_stack $@opened("76D54B80-FF66-11E9-B604-8C8590A6A134") P1
+  copy_addr %16 to [initialization] %17 : $*@opened("76D54B80-FF66-11E9-B604-8C8590A6A134") P1
+  %19 = open_existential_addr mutable_access %8 : $*P3 to $*@opened("76D54C34-FF66-11E9-B604-8C8590A6A134") P3
+  %20 = alloc_stack $@opened("76D54C34-FF66-11E9-B604-8C8590A6A134") P3
+  copy_addr %19 to [initialization] %20 : $*@opened("76D54C34-FF66-11E9-B604-8C8590A6A134") P3
+  %22 = open_existential_addr mutable_access %11 : $*P2 to $*@opened("76D54C84-FF66-11E9-B604-8C8590A6A134") P2
+  %23 = alloc_stack $@opened("76D54C84-FF66-11E9-B604-8C8590A6A134") P2
+  copy_addr %22 to [initialization] %23 : $*@opened("76D54C84-FF66-11E9-B604-8C8590A6A134") P2
+  %25 = apply %15<@opened("76D54B80-FF66-11E9-B604-8C8590A6A134") P1, @opened("76D54C84-FF66-11E9-B604-8C8590A6A134") P2, @opened("76D54C34-FF66-11E9-B604-8C8590A6A134") P3>(%17, %20, %23) : $@convention(thin) <τ_0_0, τ_0_1, τ_0_2 where τ_0_0 : P1, τ_0_1 : P2, τ_0_2 : P3> (@in τ_0_0, @in τ_0_2, @in τ_0_1) -> ()
+  destroy_addr %11 : $*P2
+  dealloc_stack %23 : $*@opened("76D54C84-FF66-11E9-B604-8C8590A6A134") P2
+  destroy_addr %8 : $*P3
+  dealloc_stack %20 : $*@opened("76D54C34-FF66-11E9-B604-8C8590A6A134") P3
+  destroy_addr %5 : $*P1
+  dealloc_stack %17 : $*@opened("76D54B80-FF66-11E9-B604-8C8590A6A134") P1
+  dealloc_stack %11 : $*P2
+  dealloc_stack %8 : $*P3
+  dealloc_stack %5 : $*P1
+  return %25 : $()
+}