Rename ConsumedReturnValueToEpilogueRetainMatcher.

Rename to ConsumedResultToEpilogueRetainMatcher

Also remove some dead code in ConsumedResultToEpilogueRetainMatcher.

NFC.

Author: trentxintong

include/swift/SILOptimizer/Analysis/ARCAnalysis.h

@@ -110,10 +110,8 @@ valueHasARCDecrementOrCheckInInstructionRange(SILValue Op,
 /// retains for a specific function.
 ///
 /// TODO: This really needs a better name.
-class ConsumedReturnValueToEpilogueRetainMatcher {
+class ConsumedResultToEpilogueRetainMatcher {
 public:
-  enum class ExitKind { Return, Throw };
-
   /// The state on how retains are found in a basic block.
   enum class FindRetainKind { 
     None,      ///< Did not find a retain.
@@ -128,18 +126,16 @@ class ConsumedReturnValueToEpilogueRetainMatcher {
   SILFunction *F;
   RCIdentityFunctionInfo *RCFI;
   AliasAnalysis *AA;
-  ExitKind Kind;
   // We use a list of instructions for now so that we can keep the same interface
   // and handle exploded retain_value later.
   RetainList EpilogueRetainInsts;
   bool HasBlock = false;
 
 public:
   /// Finds matching releases in the return block of the function \p F.
-  ConsumedReturnValueToEpilogueRetainMatcher(RCIdentityFunctionInfo *RCFI,
-                                             AliasAnalysis *AA,
-                                             SILFunction *F,
-                                             ExitKind Kind = ExitKind::Return);
+  ConsumedResultToEpilogueRetainMatcher(RCIdentityFunctionInfo *RCFI,
+                                        AliasAnalysis *AA,
+                                        SILFunction *F);
 
   /// Finds matching releases in the provided block \p BB.
   void findMatchingRetains(SILBasicBlock *BB);

lib/SILOptimizer/Analysis/ARCAnalysis.cpp

@@ -452,29 +452,19 @@ mayGuaranteedUseValue(SILInstruction *User, SILValue Ptr, AliasAnalysis *AA) {
 //===----------------------------------------------------------------------===//
 //                          Owned Argument Utilities
 //===----------------------------------------------------------------------===//
-ConsumedReturnValueToEpilogueRetainMatcher::
-ConsumedReturnValueToEpilogueRetainMatcher(RCIdentityFunctionInfo *RCFI,
-                                           AliasAnalysis *AA,
-                                           SILFunction *F,
-                                           ExitKind Kind)
-    : F(F), RCFI(RCFI), AA(AA), Kind(Kind) {
+ConsumedResultToEpilogueRetainMatcher::
+ConsumedResultToEpilogueRetainMatcher(RCIdentityFunctionInfo *RCFI,
+                                      AliasAnalysis *AA,
+                                      SILFunction *F)
+    : F(F), RCFI(RCFI), AA(AA) {
   recompute();
 }
 
-void ConsumedReturnValueToEpilogueRetainMatcher::recompute() {
+void ConsumedResultToEpilogueRetainMatcher::recompute() {
   EpilogueRetainInsts.clear();
 
   // Find the return BB of F. If we fail, then bail.
-  SILFunction::iterator BB;
-  switch (Kind) {
-  case ExitKind::Return:
-    BB = F->findReturnBB();
-    break;
-  case ExitKind::Throw:
-    BB = F->findThrowBB();
-    break;
-  }
-
+  SILFunction::iterator BB = F->findReturnBB();
   if (BB == F->end()) {
     HasBlock = false;
     return;
@@ -484,7 +474,7 @@ void ConsumedReturnValueToEpilogueRetainMatcher::recompute() {
 }
 
 void
-ConsumedReturnValueToEpilogueRetainMatcher::
+ConsumedResultToEpilogueRetainMatcher::
 findMatchingRetains(SILBasicBlock *BB) {
   // Iterate over the instructions post-order and find retains associated with
   // return value.
@@ -594,8 +584,8 @@ findMatchingRetains(SILBasicBlock *BB) {
   // all the post-dominating epilogue retains.
 }
 
-ConsumedReturnValueToEpilogueRetainMatcher::RetainKindValue
-ConsumedReturnValueToEpilogueRetainMatcher::
+ConsumedResultToEpilogueRetainMatcher::RetainKindValue
+ConsumedResultToEpilogueRetainMatcher::
 findMatchingRetainsInner(SILBasicBlock *BB, SILValue V) {
   for (auto II = BB->rbegin(), IE = BB->rend(); II != IE; ++II) {
     // Handle self-recursion.

lib/SILOptimizer/IPO/FunctionSignatureOpts.cpp

@@ -648,7 +648,7 @@ bool SignatureAnalyzer::analyze() {
       ResultDescList[0].hasConvention(ResultConvention::Owned)) {
     auto &RI = ResultDescList[0];
     // We have an @owned return value, find the epilogue retains now.
-    ConsumedReturnValueToEpilogueRetainMatcher RVToReturnRetainMap(RCIA, AA, F);
+    ConsumedResultToEpilogueRetainMatcher RVToReturnRetainMap(RCIA, AA, F);
     auto Retains = RVToReturnRetainMap.getEpilogueRetains();
     // We do not need to worry about the throw block, as the return value is only
     // going to be used in the return block/normal block of the try_apply instruction.

lib/SILOptimizer/UtilityPasses/EpilogueRetainReleaseMatcherDumper.cpp

@@ -49,7 +49,7 @@ class SILEpilogueRetainReleaseMatcherDumper : public SILModuleTransform {
       llvm::outs() << "START: sil @" << Fn.getName() << "\n";
 
       // Handle @owned return value.
-      ConsumedReturnValueToEpilogueRetainMatcher RetMap(RCIA->get(&Fn), AA, &Fn); 
+      ConsumedResultToEpilogueRetainMatcher RetMap(RCIA->get(&Fn), AA, &Fn); 
       for (auto &RI : RetMap)
         llvm::outs() << *RI;