Re-add support for try_apply instruction and update tests.

Re-work tests based on updated optimizations and check specialized
functions.

Author: zoecarver

lib/SILOptimizer/SILCombiner/SILCombinerApplyVisitors.cpp

@@ -859,12 +859,6 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
     FullApplySite Apply,
     const llvm::SmallDenseMap<unsigned, ConcreteOpenedExistentialInfo> &COAIs,
     SILBuilderContext &BuilderCtx) {
-
-  // Bail on try_apply.
-  // TODO: support try_apply.
-  if (isa<TryApplyInst>(Apply))
-    return nullptr;
-  
   // Ensure that the callee is polymorphic.
   assert(Apply.getOrigCalleeType()->isPolymorphic());
 
@@ -945,9 +939,15 @@ SILInstruction *SILCombiner::createApplyWithConcreteType(
   }
   // Now create the new apply instruction.
   SILBuilderWithScope ApplyBuilder(Apply.getInstruction(), BuilderCtx);
-  FullApplySite NewApply = ApplyBuilder.createApply(
-    Apply.getLoc(), Apply.getCallee(), NewCallSubs, NewArgs,
-    cast<ApplyInst>(Apply)->isNonThrowing());
+  FullApplySite NewApply;
+  if (auto *TAI = dyn_cast<TryApplyInst>(Apply))
+    NewApply = ApplyBuilder.createTryApply(
+        Apply.getLoc(), Apply.getCallee(), NewCallSubs, NewArgs,
+        TAI->getNormalBB(), TAI->getErrorBB());
+  else
+    NewApply = ApplyBuilder.createApply(
+        Apply.getLoc(), Apply.getCallee(), NewCallSubs, NewArgs,
+        cast<ApplyInst>(Apply)->isNonThrowing());
 
   if (auto NewAI = dyn_cast<ApplyInst>(NewApply))
     replaceInstUsesWith(*cast<ApplyInst>(Apply.getInstruction()), NewAI);

test/SILOptimizer/existential_specializer_indirect_class.sil

@@ -1,4 +1,4 @@
-// RUN: %target-sil-opt -O -wmo -enable-sil-verify-all %s | %FileCheck %s
+// RUN: %target-sil-opt -O -wmo -enable-sil-verify-all -sil-disable-pass=DeadFunctionElimination %s | %FileCheck %s
 
 sil_stage canonical
 
@@ -15,46 +15,42 @@ sil @test_indirect_class_protocol : $@convention(thin) (@in ClassProtocol) -> ()
 bb0(%0 : $*ClassProtocol):
   // CHECK-NEXT: %1 = load %0
   // CHECK-NEXT: strong_release %1
-  // CHECK-NEXT: strong_release %1
   destroy_addr %0 : $*ClassProtocol
   // CHECK-NEXT: return undef
   return undef : $()
 }
 
-// CHECK-LABEL: sil [signature_optimized_thunk] [always_inline] @test_indirect_class_protocol_guaranteed : $@convention(thin) (@in_guaranteed ClassProtocol) -> ()
-sil @test_indirect_class_protocol_guaranteed : $@convention(thin) (@in_guaranteed ClassProtocol) -> () {
+// Check that all the opened types are optimized away in the specialization of test_indirect_class_protocol_guaranteed
+// CHECK-LABEL: sil shared @$s39test_indirect_class_protocol_guaranteedTf4e_n : $@convention(thin) <τ_0_0 where τ_0_0 : ClassProtocol> (@in_guaranteed τ_0_0) -> ()
 // CHECK-NEXT: //
-// CHECK-NEXT: bb0(%0 : $*ClassProtocol):
+// CHECK-NEXT: bb0(%0 : $*τ_0_0):
+  // CHECK-NEXT: [[INPUT:%1]] = load %0
+  // CHECK-NEXT: [[METHOD:%.*]] = witness_method $C, #ClassProtocol.method
+  // CHECK-NEXT: [[ARG:%.*]] = unchecked_ref_cast [[INPUT]]
+  // CHECK-NEXT: apply [[METHOD]]<C>([[ARG]])
+  // CHECK-NEXT: return undef
+  
+sil @test_indirect_class_protocol_guaranteed : $@convention(thin) (@in_guaranteed ClassProtocol) -> () {
 bb0(%0 : $*ClassProtocol):
-// CHECK-NEXT: [[INPUT:%1]] = load %0
   %1 = load %0 : $*ClassProtocol
-  // CHECK-NEXT: [[OPENED:%.*]] = open_existential_ref [[INPUT]]
-  // CHECK-NEXT: [[CLOSED:%.*]] = unchecked_ref_cast [[OPENED]]
   %2 = open_existential_ref %1 : $ClassProtocol to $@opened("ABCDEF01-ABCD-ABCD-ABCD-ABCDEFABCDEF") ClassProtocol
-  // CHECK-NEXT: [[METHOD:%.*]] = witness_method $C, #ClassProtocol.method
   %f = witness_method $@opened("ABCDEF01-ABCD-ABCD-ABCD-ABCDEFABCDEF") ClassProtocol, #ClassProtocol.method!1 : <Self: ClassProtocol> (Self) -> () -> (), %2 : $@opened("ABCDEF01-ABCD-ABCD-ABCD-ABCDEFABCDEF") ClassProtocol : $@convention(witness_method : ClassProtocol) <Self: ClassProtocol> (@guaranteed Self) -> ()
-  // CHECK-NEXT: apply [[METHOD]]<C>([[CLOSED]])
   apply %f<@opened("ABCDEF01-ABCD-ABCD-ABCD-ABCDEFABCDEF") ClassProtocol>(%2) : $@convention(witness_method : ClassProtocol) <Self: ClassProtocol> (@guaranteed Self) -> ()
-  // CHECK-NEXT: strong_release [[INPUT]]
-  // CHECK-NEXT: return undef
   return undef : $()
 }
 
-// CHECK-LABEL: sil @invoke_indirect_class_protocol : $@convention(thin) (@guaranteed C) -> ()
-
-// Make sure both applies were inlined.
-
+// Check that a specialization of test_indirect_class_protocol is created.
+// CHECK-LABEL: sil shared [signature_optimized_thunk] [always_inline] @$s28test_indirect_class_protocolTf4e_n4main1CC_Tg5 : $@convention(thin) (@owned C) -> ()
 // CHECK-NEXT: //
 // CHECK-NEXT: bb0(%0 : $C):
-
-// CHECK-NEXT: [[METHOD:%.*]] = witness_method $C, #ClassProtocol.method
-// CHECK-NEXT: strong_retain %0
-// CHECK-NEXT: apply [[METHOD]]<C>(%0)
-
-// CHECK-NEXT: strong_release %0
-// CHECK-NEXT: strong_release %0
 // CHECK-NEXT: strong_release %0
+// CHECK-NEXT: return undef
+// CHECK-LABEL: end sil function '$s28test_indirect_class_protocolTf4e_n4main1CC_Tg5'
 
+// Check the generated specialization of test_indirect_class_protocol
+// CHECK-LABEL: sil shared @$s28test_indirect_class_protocolTf4e_n4main1CC_Tg5Tf4d_n : $@convention(thin) () -> ()
+// Make sure *everything* was inlined / optimized away
+// CHECK-NEXT: bb0:
 // CHECK-NEXT: return undef
 
 sil @invoke_indirect_class_protocol : $@convention(thin) (@guaranteed C) -> () {