wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed dead code from ObjCARCOpts relating to tracking objc_retainBlocks through the ARC Dataflow analysis. By the time we get to the ARC dataflow analysis, any objc_retainBlock calls are not optimizable. 

llvm-svn: 178306
This commit is contained in:
Michael Gottesman 2013-03-28 23:08:44 +00:00
parent dbac025d84
commit ba64859e6e
1 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
llvm/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
View File

@ -391,10 +391,6 @@ namespace {
/// KnownSafe is true when either of these conditions is satisfied. /// KnownSafe is true when either of these conditions is satisfied.
bool KnownSafe; bool KnownSafe;
/// True if the Calls are objc_retainBlock calls (as opposed to objc_retain
/// calls).
bool IsRetainBlock;
/// True of the objc_release calls are all marked with the "tail" keyword. /// True of the objc_release calls are all marked with the "tail" keyword.
bool IsTailCallRelease; bool IsTailCallRelease;
@ -411,9 +407,7 @@ namespace {
SmallPtrSet<Instruction *, 2> ReverseInsertPts; SmallPtrSet<Instruction *, 2> ReverseInsertPts;
RRInfo() : RRInfo() :
KnownSafe(false), IsRetainBlock(false), KnownSafe(false), IsTailCallRelease(false), ReleaseMetadata(0) {}
IsTailCallRelease(false),
ReleaseMetadata(0) {}
void clear(); void clear();
}; };
@ -421,7 +415,6 @@ namespace {
void RRInfo::clear() { void RRInfo::clear() {
KnownSafe = false; KnownSafe = false;
IsRetainBlock = false;
IsTailCallRelease = false; IsTailCallRelease = false;
ReleaseMetadata = 0; ReleaseMetadata = 0;
Calls.clear(); Calls.clear();
@ -489,11 +482,7 @@ void
PtrState::Merge(const PtrState &Other, bool TopDown) { PtrState::Merge(const PtrState &Other, bool TopDown) {
Seq = MergeSeqs(Seq, Other.Seq, TopDown); Seq = MergeSeqs(Seq, Other.Seq, TopDown);
KnownPositiveRefCount = KnownPositiveRefCount && Other.KnownPositiveRefCount; KnownPositiveRefCount = KnownPositiveRefCount && Other.KnownPositiveRefCount;
// We can't merge a plain objc_retain with an objc_retainBlock.
if (RRI.IsRetainBlock != Other.RRI.IsRetainBlock)
Seq = S_None;
// If we're not in a sequence (anymore), drop all associated state. // If we're not in a sequence (anymore), drop all associated state.
if (Seq == S_None) { if (Seq == S_None) {
Partial = false; Partial = false;
@ -1807,10 +1796,8 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
case S_CanRelease: case S_CanRelease:
// Don't do retain+release tracking for IC_RetainRV, because it's // Don't do retain+release tracking for IC_RetainRV, because it's
// better to let it remain as the first instruction after a call. // better to let it remain as the first instruction after a call.
if (Class != IC_RetainRV) { if (Class != IC_RetainRV)
S.RRI.IsRetainBlock = Class == IC_RetainBlock;
Retains[Inst] = S.RRI; Retains[Inst] = S.RRI;
}
S.ClearSequenceProgress(); S.ClearSequenceProgress();
break; break;
case S_None: case S_None:
@ -2022,7 +2009,6 @@ ObjCARCOpt::VisitInstructionTopDown(Instruction *Inst,
ANNOTATE_TOPDOWN(Inst, Arg, S.GetSeq(), S_Retain); ANNOTATE_TOPDOWN(Inst, Arg, S.GetSeq(), S_Retain);
S.ResetSequenceProgress(S_Retain); S.ResetSequenceProgress(S_Retain);
S.RRI.IsRetainBlock = Class == IC_RetainBlock;
S.RRI.KnownSafe = S.HasKnownPositiveRefCount(); S.RRI.KnownSafe = S.HasKnownPositiveRefCount();
S.RRI.Calls.insert(Inst); S.RRI.Calls.insert(Inst);
} }
@ -2330,16 +2316,10 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
Value *MyArg = ArgTy == ParamTy ? Arg : Value *MyArg = ArgTy == ParamTy ? Arg :
new BitCastInst(Arg, ParamTy, "", InsertPt); new BitCastInst(Arg, ParamTy, "", InsertPt);
CallInst *Call = CallInst *Call =
CallInst::Create(RetainsToMove.IsRetainBlock ? CallInst::Create(getRetainCallee(M), MyArg, "", InsertPt);
getRetainBlockCallee(M) : getRetainCallee(M),
MyArg, "", InsertPt);
Call->setDoesNotThrow(); Call->setDoesNotThrow();
if (RetainsToMove.IsRetainBlock) Call->setTailCall();
Call->setMetadata(CopyOnEscapeMDKind,
MDNode::get(M->getContext(), ArrayRef<Value *>()));
else
Call->setTailCall();
DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Inserting new Release: " << *Call DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Inserting new Release: " << *Call
<< "\n" << "\n"
" At insertion point: " << *InsertPt " At insertion point: " << *InsertPt
@ -2414,7 +2394,6 @@ ObjCARCOpt::ConnectTDBUTraversals(DenseMap<const BasicBlock *, BBState>
unsigned OldCount = 0; unsigned OldCount = 0;
unsigned NewCount = 0; unsigned NewCount = 0;
bool FirstRelease = true; bool FirstRelease = true;
bool FirstRetain = true;
for (;;) { for (;;) {
for (SmallVectorImpl<Instruction *>::const_iterator for (SmallVectorImpl<Instruction *>::const_iterator
NI = NewRetains.begin(), NE = NewRetains.end(); NI != NE; ++NI) { NI = NewRetains.begin(), NE = NewRetains.end(); NI != NE; ++NI) {
@ -2495,16 +2474,6 @@ ObjCARCOpt::ConnectTDBUTraversals(DenseMap<const BasicBlock *, BBState>
OldDelta += PathCount; OldDelta += PathCount;
OldCount += PathCount; OldCount += PathCount;
// Merge the IsRetainBlock values.
if (FirstRetain) {
RetainsToMove.IsRetainBlock = NewReleaseRetainRRI.IsRetainBlock;
FirstRetain = false;
} else if (ReleasesToMove.IsRetainBlock !=
NewReleaseRetainRRI.IsRetainBlock)
// It's not possible to merge the sequences if one uses
// objc_retain and the other uses objc_retainBlock.
return false;
// Collect the optimal insertion points. // Collect the optimal insertion points.
if (!KnownSafe) if (!KnownSafe)
for (SmallPtrSet<Instruction *, 2>::const_iterator for (SmallPtrSet<Instruction *, 2>::const_iterator