diff --git a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp index 5a73bc378f7..31c5666b202 100644 --- a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp +++ b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp @@ -459,15 +459,16 @@ namespace { DenseMap &Releases, SmallVectorImpl &DeadInsts, Module *M); - bool ConnectTDBUTraversals(DenseMap &BBStates, - BlotMapVector &Retains, - DenseMap &Releases, Module *M, - SmallVectorImpl &NewRetains, - SmallVectorImpl &NewReleases, - SmallVectorImpl &DeadInsts, - RRInfo &RetainsToMove, RRInfo &ReleasesToMove, - Value *Arg, bool KnownSafe, - bool &AnyPairsCompletelyEliminated); + bool + PairUpRetainsAndReleases(DenseMap &BBStates, + BlotMapVector &Retains, + DenseMap &Releases, Module *M, + SmallVectorImpl &NewRetains, + SmallVectorImpl &NewReleases, + SmallVectorImpl &DeadInsts, + RRInfo &RetainsToMove, RRInfo &ReleasesToMove, + Value *Arg, bool KnownSafe, + bool &AnyPairsCompletelyEliminated); bool PerformCodePlacement(DenseMap &BBStates, BlotMapVector &Retains, @@ -1453,7 +1454,7 @@ void ObjCARCOpt::MoveCalls(Value *Arg, RRInfo &RetainsToMove, } -bool ObjCARCOpt::ConnectTDBUTraversals( +bool ObjCARCOpt::PairUpRetainsAndReleases( DenseMap &BBStates, BlotMapVector &Retains, DenseMap &Releases, Module *M, @@ -1705,11 +1706,10 @@ bool ObjCARCOpt::PerformCodePlacement( // Connect the dots between the top-down-collected RetainsToMove and // bottom-up-collected ReleasesToMove to form sets of related calls. NewRetains.push_back(Retain); - bool PerformMoveCalls = - ConnectTDBUTraversals(BBStates, Retains, Releases, M, NewRetains, - NewReleases, DeadInsts, RetainsToMove, - ReleasesToMove, Arg, KnownSafe, - AnyPairsCompletelyEliminated); + bool PerformMoveCalls = PairUpRetainsAndReleases( + BBStates, Retains, Releases, M, NewRetains, NewReleases, DeadInsts, + RetainsToMove, ReleasesToMove, Arg, KnownSafe, + AnyPairsCompletelyEliminated); if (PerformMoveCalls) { // Ok, everything checks out and we're all set. Let's move/delete some