Merge pull request #4638 from trentxintong/wireup-FSO

Replace SmallVector with SmallSetVector in the new epilogue ARC matcher

Author: trentxintong

include/swift/SILOptimizer/Analysis/ARCAnalysis.h

@@ -447,7 +447,7 @@ class EpilogueARCContext {
   RCIdentityFunctionInfo *RCFI;
 
   /// The epilogue retains or releases.
-  llvm::SmallVector<SILInstruction *, 1> EpilogueARCInsts; 
+  llvm::SmallSetVector<SILInstruction *, 1> EpilogueARCInsts; 
 
   /// All the retain/release block state for all the basic blocks in the function. 
   llvm::DenseMap<SILBasicBlock *, EpilogueARCBlockState *> EpilogueARCBlockStates;
@@ -507,7 +507,7 @@ class EpilogueARCContext {
 
   /// Reset the epilogue arc instructions. 
   void resetEpilogueARCInsts() { EpilogueARCInsts.clear(); }
-  llvm::SmallVector<SILInstruction *, 1> getEpilogueARCInsts() {
+  llvm::SmallSetVector<SILInstruction *, 1> getEpilogueARCInsts() {
     return EpilogueARCInsts;
   }
 
@@ -577,7 +577,7 @@ class EpilogueARCContext {
 /// empty set if no epilogue ARC instructions can be found.
 ///
 /// NOTE: This function assumes Arg is has @owned semantic.
-llvm::SmallVector<SILInstruction *, 1> 
+llvm::SmallSetVector<SILInstruction *, 1> 
 computeEpilogueARCInstructions(EpilogueARCContext::EpilogueARCKind Kind,
                                SILValue Arg, SILFunction *F,
                                PostOrderFunctionInfo *PO, AliasAnalysis *AA,

include/swift/SILOptimizer/Utils/FunctionSignatureOptUtils.h

@@ -137,7 +137,7 @@ struct ResultDescriptor {
   /// If non-null, this is the release in the return block of the callee, which
   /// is associated with this parameter if it is @owned. If the parameter is not
   /// @owned or we could not find such a release in the callee, this is null.
-  RetainList CalleeRetain;
+  llvm::SmallSetVector<SILInstruction *, 1> CalleeRetain;
 
   /// This is owned to guaranteed.
   bool OwnedToGuaranteed;

lib/SILOptimizer/Analysis/ARCAnalysis.cpp

@@ -1301,7 +1301,7 @@ bool EpilogueARCContext::computeEpilogueARC() {
     for (auto I = B->rbegin(), E = B->rend(); I != E; ++I) {
       // This is a transition from 1 to 0 due to an interested instruction.
       if (isInterestedInstruction(&*I)) {
-        EpilogueARCInsts.push_back(&*I);
+        EpilogueARCInsts.insert(&*I);
         break;
       }
       // This is a transition from 1 to 0 due to a blocking instruction.
@@ -1313,7 +1313,7 @@ bool EpilogueARCContext::computeEpilogueARC() {
   return true;
 }
 
-llvm::SmallVector<SILInstruction *, 1>
+llvm::SmallSetVector<SILInstruction *, 1>
 swift::computeEpilogueARCInstructions(EpilogueARCContext::EpilogueARCKind Kind,
                                       SILValue Arg, SILFunction *F,
                                       PostOrderFunctionInfo *PO, AliasAnalysis *AA,

lib/SILOptimizer/UtilityPasses/EpilogueARCMatcherDumper.cpp

@@ -52,15 +52,15 @@ class SILEpilogueARCMatcherDumper : public SILModuleTransform {
         llvm::outs() << *Arg;
 
         // Find the retain instructions for the argument.
-        llvm::SmallVector<SILInstruction *, 1> RelInsts = 
+        llvm::SmallSetVector<SILInstruction *, 1> RelInsts = 
           computeEpilogueARCInstructions(EpilogueARCContext::EpilogueARCKind::Release,
                                          Arg, &F, PO, AA, RCFI);
         for (auto I : RelInsts) {
           llvm::outs() << *I << "\n";
         }
 
         // Find the release instructions for the argument.
-        llvm::SmallVector<SILInstruction *, 1> RetInsts = 
+        llvm::SmallSetVector<SILInstruction *, 1> RetInsts = 
           computeEpilogueARCInstructions(EpilogueARCContext::EpilogueARCKind::Retain,
                                          Arg, &F, PO, AA, RCFI);
         for (auto I : RetInsts) {