6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up whitespace and made debug logging less verbose.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178893 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Michael Gottesman
2013-04-05 18:10:41 +00:00
parent f340d34a97
commit 5789a86f5c
1 changed files with 95 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
lib/Transforms/ObjCARC/ObjCARCOpts.cpp
View File

@@ -191,13 +191,13 @@ static bool DoesRetainableObjPtrEscape(const User *Ptr) {
do { do {
const Value *V = Worklist.pop_back_val(); const Value *V = Worklist.pop_back_val();
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: Visiting: " << *V << "\n"); DEBUG(dbgs() << "Visiting: " << *V << "\n");
for (Value::const_use_iterator UI = V->use_begin(), UE = V->use_end(); for (Value::const_use_iterator UI = V->use_begin(), UE = V->use_end();
UI != UE; ++UI) { UI != UE; ++UI) {
const User *UUser = *UI; const User *UUser = *UI;
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: User: " << *UUser << "\n"); DEBUG(dbgs() << "User: " << *UUser << "\n");
// Special - Use by a call (callee or argument) is not considered // Special - Use by a call (callee or argument) is not considered
// to be an escape. // to be an escape.
@@ -207,8 +207,7 @@ static bool DoesRetainableObjPtrEscape(const User *Ptr) {
case IC_StoreStrong: case IC_StoreStrong:
case IC_Autorelease: case IC_Autorelease:
case IC_AutoreleaseRV: { case IC_AutoreleaseRV: {
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: User copies pointer " DEBUG(dbgs() << "User copies pointer arguments. Pointer Escapes!\n");
"arguments. Pointer Escapes!\n");
// These special functions make copies of their pointer arguments. // These special functions make copies of their pointer arguments.
return true; return true;
} }
@@ -223,12 +222,11 @@ static bool DoesRetainableObjPtrEscape(const User *Ptr) {
isa<PHINode>(UUser) || isa<SelectInst>(UUser)) { isa<PHINode>(UUser) || isa<SelectInst>(UUser)) {
if (VisitedSet.insert(UUser)) { if (VisitedSet.insert(UUser)) {
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: User copies value. " DEBUG(dbgs() << "User copies value. Ptr escapes if result escapes."
"Ptr escapes if result escapes. Adding to list.\n"); " Adding to list.\n");
Worklist.push_back(UUser); Worklist.push_back(UUser);
} else { } else {
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: Already visited node." DEBUG(dbgs() << "Already visited node.\n");
"\n");
} }
continue; continue;
} }
@@ -245,13 +243,13 @@ static bool DoesRetainableObjPtrEscape(const User *Ptr) {
continue; continue;
} }
// Otherwise, conservatively assume an escape. // Otherwise, conservatively assume an escape.
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: Assuming ptr escapes.\n"); DEBUG(dbgs() << "Assuming ptr escapes.\n");
return true; return true;
} }
} while (!Worklist.empty()); } while (!Worklist.empty());
// No escapes found. // No escapes found.
DEBUG(dbgs() << "DoesRetainableObjPtrEscape: Ptr does not escape.\n"); DEBUG(dbgs() << "Ptr does not escape.\n");
return false; return false;
} }
@@ -457,7 +455,8 @@ namespace {
} }
void SetSeq(Sequence NewSeq) { void SetSeq(Sequence NewSeq) {
Seq = NewSeq; DEBUG(dbgs() << "Old: " << Seq << "; New: " << NewSeq << "\n");
Seq = NewSeq;
} }
Sequence GetSeq() const { Sequence GetSeq() const {
@@ -469,7 +468,7 @@ namespace {
} }
void ResetSequenceProgress(Sequence NewSeq) { void ResetSequenceProgress(Sequence NewSeq) {
Seq = NewSeq; SetSeq(NewSeq);
Partial = false; Partial = false;
RRI.clear(); RRI.clear();
} }
@@ -909,27 +908,27 @@ static void GenerateARCAnnotation(unsigned InstMDId,
#define ANNOTATE_BB(_states, _bb, _name, _type, _direction) \ #define ANNOTATE_BB(_states, _bb, _name, _type, _direction) \
do { \ do { \
if (EnableARCAnnotations) { \ if (EnableARCAnnotations) { \
for(BBState::ptr_const_iterator I = (_states)._direction##_ptr_begin(), \ for(BBState::ptr_const_iterator I = (_states)._direction##_ptr_begin(), \
E = (_states)._direction##_ptr_end(); I != E; ++I) { \ E = (_states)._direction##_ptr_end(); I != E; ++I) { \
Value *Ptr = const_cast<Value*>(I->first); \ Value *Ptr = const_cast<Value*>(I->first); \
Sequence Seq = I->second.GetSeq(); \ Sequence Seq = I->second.GetSeq(); \
GenerateARCBB ## _type ## Annotation(_name, (_bb), Ptr, Seq); \ GenerateARCBB ## _type ## Annotation(_name, (_bb), Ptr, Seq); \
} \
} \ } \
} \ } while (0)
} while (0)
#define ANNOTATE_BOTTOMUP_BBSTART(_states, _basicblock) \ #define ANNOTATE_BOTTOMUP_BBSTART(_states, _basicblock) \
ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.bottomup.bbstart", \ ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.bottomup.bbstart", \
Entrance, bottom_up) Entrance, bottom_up)
#define ANNOTATE_BOTTOMUP_BBEND(_states, _basicblock) \ #define ANNOTATE_BOTTOMUP_BBEND(_states, _basicblock) \
ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.bottomup.bbend", \ ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.bottomup.bbend", \
Terminator, bottom_up) Terminator, bottom_up)
#define ANNOTATE_TOPDOWN_BBSTART(_states, _basicblock) \ #define ANNOTATE_TOPDOWN_BBSTART(_states, _basicblock) \
ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.topdown.bbstart", \ ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.topdown.bbstart", \
Entrance, top_down) Entrance, top_down)
#define ANNOTATE_TOPDOWN_BBEND(_states, _basicblock) \ #define ANNOTATE_TOPDOWN_BBEND(_states, _basicblock) \
ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.topdown.bbend", \ ANNOTATE_BB(_states, _basicblock, "llvm.arc.annotation.topdown.bbend", \
Terminator, top_down) Terminator, top_down)
#else // !ARC_ANNOTATION #else // !ARC_ANNOTATION
@@ -1221,16 +1220,13 @@ ObjCARCOpt::OptimizeRetainCall(Function &F, Instruction *Retain) {
Changed = true; Changed = true;
++NumPeeps; ++NumPeeps;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeRetainCall: Transforming " DEBUG(dbgs() << "Transforming objc_retain => "
"objc_retain => objc_retainAutoreleasedReturnValue" "objc_retainAutoreleasedReturnValue since the operand is a "
" since the operand is a return value.\n" "return value.\nOld: "<< *Retain << "\n");
" Old: "
<< *Retain << "\n");
cast<CallInst>(Retain)->setCalledFunction(getRetainRVCallee(F.getParent())); cast<CallInst>(Retain)->setCalledFunction(getRetainRVCallee(F.getParent()));
DEBUG(dbgs() << " New: " DEBUG(dbgs() << "New: " << *Retain << "\n");
<< *Retain << "\n");
} }
/// Turn objc_retainAutoreleasedReturnValue into objc_retain if the operand is /// Turn objc_retainAutoreleasedReturnValue into objc_retain if the operand is
@@ -1269,9 +1265,8 @@ ObjCARCOpt::OptimizeRetainRVCall(Function &F, Instruction *RetainRV) {
Changed = true; Changed = true;
++NumPeeps; ++NumPeeps;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeRetainRVCall: Erasing " << *I << "\n" DEBUG(dbgs() << "Erasing autoreleaseRV,retainRV pair: " << *I << "\n"
<< " Erasing " << *RetainRV << "Erasing " << *RetainRV << "\n");
<< "\n");
EraseInstruction(I); EraseInstruction(I);
EraseInstruction(RetainRV); EraseInstruction(RetainRV);
@@ -1283,16 +1278,13 @@ ObjCARCOpt::OptimizeRetainRVCall(Function &F, Instruction *RetainRV) {
Changed = true; Changed = true;
++NumPeeps; ++NumPeeps;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeRetainRVCall: Transforming " DEBUG(dbgs() << "Transforming objc_retainAutoreleasedReturnValue => "
"objc_retainAutoreleasedReturnValue => "
"objc_retain since the operand is not a return value.\n" "objc_retain since the operand is not a return value.\n"
" Old: " "Old = " << *RetainRV << "\n");
<< *RetainRV << "\n");
cast<CallInst>(RetainRV)->setCalledFunction(getRetainCallee(F.getParent())); cast<CallInst>(RetainRV)->setCalledFunction(getRetainCallee(F.getParent()));
DEBUG(dbgs() << " New: " DEBUG(dbgs() << "New = " << *RetainRV << "\n");
<< *RetainRV << "\n");
return false; return false;
} }
@@ -1321,12 +1313,10 @@ ObjCARCOpt::OptimizeAutoreleaseRVCall(Function &F, Instruction *AutoreleaseRV,
Changed = true; Changed = true;
++NumPeeps; ++NumPeeps;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeAutoreleaseRVCall: Transforming " DEBUG(dbgs() << "Transforming objc_autoreleaseReturnValue => "
"objc_autoreleaseReturnValue => "
"objc_autorelease since its operand is not used as a return " "objc_autorelease since its operand is not used as a return "
"value.\n" "value.\n"
" Old: " "Old = " << *AutoreleaseRV << "\n");
<< *AutoreleaseRV << "\n");
CallInst *AutoreleaseRVCI = cast<CallInst>(AutoreleaseRV); CallInst *AutoreleaseRVCI = cast<CallInst>(AutoreleaseRV);
AutoreleaseRVCI-> AutoreleaseRVCI->
@@ -1334,8 +1324,7 @@ ObjCARCOpt::OptimizeAutoreleaseRVCall(Function &F, Instruction *AutoreleaseRV,
AutoreleaseRVCI->setTailCall(false); // Never tail call objc_autorelease. AutoreleaseRVCI->setTailCall(false); // Never tail call objc_autorelease.
Class = IC_Autorelease; Class = IC_Autorelease;
DEBUG(dbgs() << " New: " DEBUG(dbgs() << "New: " << *AutoreleaseRV << "\n");
<< *AutoreleaseRV << "\n");
} }
@@ -1371,6 +1360,7 @@ ObjCARCOpt::OptimizeRetainBlockCall(Function &F, Instruction *Inst,
/// Visit each call, one at a time, and make simplifications without doing any /// Visit each call, one at a time, and make simplifications without doing any
/// additional analysis. /// additional analysis.
void ObjCARCOpt::OptimizeIndividualCalls(Function &F) { void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
DEBUG(dbgs() << "\n== ObjCARCOpt::OptimizeIndividualCalls ==\n");
// Reset all the flags in preparation for recomputing them. // Reset all the flags in preparation for recomputing them.
UsedInThisFunction = 0; UsedInThisFunction = 0;
@@ -1380,8 +1370,7 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
InstructionClass Class = GetBasicInstructionClass(Inst); InstructionClass Class = GetBasicInstructionClass(Inst);
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Visiting: Class: " DEBUG(dbgs() << "Visiting: Class: " << Class << "; " << *Inst << "\n");
<< Class << "; " << *Inst << "\n");
switch (Class) { switch (Class) {
default: break; default: break;
@@ -1397,8 +1386,7 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
case IC_NoopCast: case IC_NoopCast:
Changed = true; Changed = true;
++NumNoops; ++NumNoops;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Erasing no-op cast:" DEBUG(dbgs() << "Erasing no-op cast: " << *Inst << "\n");
" " << *Inst << "\n");
EraseInstruction(Inst); EraseInstruction(Inst);
continue; continue;
@@ -1416,11 +1404,8 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
Constant::getNullValue(Ty), Constant::getNullValue(Ty),
CI); CI);
llvm::Value *NewValue = UndefValue::get(CI->getType()); llvm::Value *NewValue = UndefValue::get(CI->getType());
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: A null " DEBUG(dbgs() << "A null pointer-to-weak-pointer is undefined behavior."
"pointer-to-weak-pointer is undefined behavior.\n" "\nOld = " << *CI << "\nNew = " << *NewValue << "\n");
" Old = " << *CI <<
"\n New = " <<
*NewValue << "\n");
CI->replaceAllUsesWith(NewValue); CI->replaceAllUsesWith(NewValue);
CI->eraseFromParent(); CI->eraseFromParent();
continue; continue;
@@ -1439,11 +1424,8 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
CI); CI);
llvm::Value *NewValue = UndefValue::get(CI->getType()); llvm::Value *NewValue = UndefValue::get(CI->getType());
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: A null " DEBUG(dbgs() << "A null pointer-to-weak-pointer is undefined behavior."
"pointer-to-weak-pointer is undefined behavior.\n" "\nOld = " << *CI << "\nNew = " << *NewValue << "\n");
" Old = " << *CI <<
"\n New = " <<
*NewValue << "\n");
CI->replaceAllUsesWith(NewValue); CI->replaceAllUsesWith(NewValue);
CI->eraseFromParent(); CI->eraseFromParent();
@@ -1486,12 +1468,9 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
NewCall->setMetadata(ImpreciseReleaseMDKind, NewCall->setMetadata(ImpreciseReleaseMDKind,
MDNode::get(C, ArrayRef<Value *>())); MDNode::get(C, ArrayRef<Value *>()));
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Replacing " DEBUG(dbgs() << "Replacing autorelease{,RV}(x) with objc_release(x) "
"objc_autorelease(x) with objc_release(x) since x is " "since x is otherwise unused.\nOld: " << *Call << "\nNew: "
"otherwise unused.\n" << *NewCall << "\n");
" Old: " << *Call <<
"\n New: " <<
*NewCall << "\n");
EraseInstruction(Call); EraseInstruction(Call);
Inst = NewCall; Inst = NewCall;
@@ -1503,9 +1482,8 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
// a tail keyword. // a tail keyword.
if (IsAlwaysTail(Class)) { if (IsAlwaysTail(Class)) {
Changed = true; Changed = true;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Adding tail keyword" DEBUG(dbgs() << "Adding tail keyword to function since it can never be "
" to function since it can never be passed stack args: " << *Inst << "passed stack args: " << *Inst << "\n");
"\n");
cast<CallInst>(Inst)->setTailCall(); cast<CallInst>(Inst)->setTailCall();
} }
@@ -1513,8 +1491,7 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
// semantics of ARC truly do not do so. // semantics of ARC truly do not do so.
if (IsNeverTail(Class)) { if (IsNeverTail(Class)) {
Changed = true; Changed = true;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Removing tail " DEBUG(dbgs() << "Removing tail keyword from function: " << *Inst <<
"keyword from function: " << *Inst <<
"\n"); "\n");
cast<CallInst>(Inst)->setTailCall(false); cast<CallInst>(Inst)->setTailCall(false);
} }
@@ -1522,8 +1499,8 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
// Set nounwind as needed. // Set nounwind as needed.
if (IsNoThrow(Class)) { if (IsNoThrow(Class)) {
Changed = true; Changed = true;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Found no throw" DEBUG(dbgs() << "Found no throw class. Setting nounwind on: " << *Inst
" class. Setting nounwind on: " << *Inst << "\n"); << "\n");
cast<CallInst>(Inst)->setDoesNotThrow(); cast<CallInst>(Inst)->setDoesNotThrow();
} }
@@ -1538,8 +1515,8 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
if (IsNullOrUndef(Arg)) { if (IsNullOrUndef(Arg)) {
Changed = true; Changed = true;
++NumNoops; ++NumNoops;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: ARC calls with " DEBUG(dbgs() << "ARC calls with null are no-ops. Erasing: " << *Inst
" null are no-ops. Erasing: " << *Inst << "\n"); << "\n");
EraseInstruction(Inst); EraseInstruction(Inst);
continue; continue;
} }
@@ -1633,10 +1610,9 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
Clone->setArgOperand(0, Op); Clone->setArgOperand(0, Op);
Clone->insertBefore(InsertPos); Clone->insertBefore(InsertPos);
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Cloning " DEBUG(dbgs() << "Cloning "
<< *CInst << "\n" << *CInst << "\n"
" And inserting " "And inserting clone at " << *InsertPos << "\n");
"clone at " << *InsertPos << "\n");
Worklist.push_back(std::make_pair(Clone, Incoming)); Worklist.push_back(std::make_pair(Clone, Incoming));
} }
} }
@@ -1648,7 +1624,6 @@ void ObjCARCOpt::OptimizeIndividualCalls(Function &F) {
} }
} while (!Worklist.empty()); } while (!Worklist.empty());
} }
DEBUG(dbgs() << "ObjCARCOpt::OptimizeIndividualCalls: Finished List.\n");
} }
/// Check for critical edges, loop boundaries, irreducible control flow, or /// Check for critical edges, loop boundaries, irreducible control flow, or
@@ -1786,8 +1761,7 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
// pairs by making PtrState hold a stack of states, but this is // pairs by making PtrState hold a stack of states, but this is
// simple and avoids adding overhead for the non-nested case. // simple and avoids adding overhead for the non-nested case.
if (S.GetSeq() == S_Release || S.GetSeq() == S_MovableRelease) { if (S.GetSeq() == S_Release || S.GetSeq() == S_MovableRelease) {
DEBUG(dbgs() << "ObjCARCOpt::VisitInstructionBottomUp: Found nested " DEBUG(dbgs() << "Found nested releases (i.e. a release pair)\n");
"releases (i.e. a release pair)\n");
NestingDetected = true; NestingDetected = true;
} }
@@ -1861,6 +1835,8 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
// Check for possible releases. // Check for possible releases.
if (CanAlterRefCount(Inst, Ptr, PA, Class)) { if (CanAlterRefCount(Inst, Ptr, PA, Class)) {
DEBUG(dbgs() << "CanAlterRefCount: Seq: " << Seq << "; " << *Ptr
<< "\n");
S.ClearKnownPositiveRefCount(); S.ClearKnownPositiveRefCount();
switch (Seq) { switch (Seq) {
case S_Use: case S_Use:
@@ -1883,6 +1859,8 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
case S_Release: case S_Release:
case S_MovableRelease: case S_MovableRelease:
if (CanUse(Inst, Ptr, PA, Class)) { if (CanUse(Inst, Ptr, PA, Class)) {
DEBUG(dbgs() << "CanUse: Seq: " << Seq << "; " << *Ptr
<< "\n");
assert(S.RRI.ReverseInsertPts.empty()); assert(S.RRI.ReverseInsertPts.empty());
// If this is an invoke instruction, we're scanning it as part of // If this is an invoke instruction, we're scanning it as part of
// one of its successor blocks, since we can't insert code after it // one of its successor blocks, since we can't insert code after it
@@ -1894,6 +1872,8 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
S.SetSeq(S_Use); S.SetSeq(S_Use);
ANNOTATE_BOTTOMUP(Inst, Ptr, Seq, S_Use); ANNOTATE_BOTTOMUP(Inst, Ptr, Seq, S_Use);
} else if (Seq == S_Release && IsUser(Class)) { } else if (Seq == S_Release && IsUser(Class)) {
DEBUG(dbgs() << "PreciseReleaseUse: Seq: " << Seq << "; " << *Ptr
<< "\n");
// Non-movable releases depend on any possible objc pointer use. // Non-movable releases depend on any possible objc pointer use.
S.SetSeq(S_Stop); S.SetSeq(S_Stop);
ANNOTATE_BOTTOMUP(Inst, Ptr, S_Release, S_Stop); ANNOTATE_BOTTOMUP(Inst, Ptr, S_Release, S_Stop);
@@ -1907,6 +1887,8 @@ ObjCARCOpt::VisitInstructionBottomUp(Instruction *Inst,
break; break;
case S_Stop: case S_Stop:
if (CanUse(Inst, Ptr, PA, Class)) { if (CanUse(Inst, Ptr, PA, Class)) {
DEBUG(dbgs() << "PreciseStopUse: Seq: " << Seq << "; " << *Ptr
<< "\n");
S.SetSeq(S_Use); S.SetSeq(S_Use);
ANNOTATE_BOTTOMUP(Inst, Ptr, Seq, S_Use); ANNOTATE_BOTTOMUP(Inst, Ptr, Seq, S_Use);
} }
@@ -1927,6 +1909,9 @@ bool
ObjCARCOpt::VisitBottomUp(BasicBlock *BB, ObjCARCOpt::VisitBottomUp(BasicBlock *BB,
DenseMap<const BasicBlock *, BBState> &BBStates, DenseMap<const BasicBlock *, BBState> &BBStates,
MapVector<Value *, RRInfo> &Retains) { MapVector<Value *, RRInfo> &Retains) {
DEBUG(dbgs() << "\n== ObjCARCOpt::VisitBottomUp ==\n");
bool NestingDetected = false; bool NestingDetected = false;
BBState &MyStates = BBStates[BB]; BBState &MyStates = BBStates[BB];
@@ -1960,7 +1945,7 @@ ObjCARCOpt::VisitBottomUp(BasicBlock *BB,
if (isa<InvokeInst>(Inst)) if (isa<InvokeInst>(Inst))
continue; continue;
DEBUG(dbgs() << "ObjCARCOpt::VisitButtonUp: Visiting " << *Inst << "\n"); DEBUG(dbgs() << "Visiting " << *Inst << "\n");
NestingDetected |= VisitInstructionBottomUp(Inst, BB, Retains, MyStates); NestingDetected |= VisitInstructionBottomUp(Inst, BB, Retains, MyStates);
} }
@@ -2127,6 +2112,7 @@ bool
ObjCARCOpt::VisitTopDown(BasicBlock *BB, ObjCARCOpt::VisitTopDown(BasicBlock *BB,
DenseMap<const BasicBlock *, BBState> &BBStates, DenseMap<const BasicBlock *, BBState> &BBStates,
DenseMap<Value *, RRInfo> &Releases) { DenseMap<Value *, RRInfo> &Releases) {
DEBUG(dbgs() << "\n== ObjCARCOpt::VisitTopDown ==\n");
bool NestingDetected = false; bool NestingDetected = false;
BBState &MyStates = BBStates[BB]; BBState &MyStates = BBStates[BB];
@@ -2156,7 +2142,7 @@ ObjCARCOpt::VisitTopDown(BasicBlock *BB,
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
Instruction *Inst = I; Instruction *Inst = I;
DEBUG(dbgs() << "ObjCARCOpt::VisitTopDown: Visiting " << *Inst << "\n"); DEBUG(dbgs() << "Visiting " << *Inst << "\n");
NestingDetected |= VisitInstructionTopDown(Inst, Releases, MyStates); NestingDetected |= VisitInstructionTopDown(Inst, Releases, MyStates);
} }
@@ -2292,10 +2278,12 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
MapVector<Value *, RRInfo> &Retains, MapVector<Value *, RRInfo> &Retains,
DenseMap<Value *, RRInfo> &Releases, DenseMap<Value *, RRInfo> &Releases,
SmallVectorImpl<Instruction *> &DeadInsts, SmallVectorImpl<Instruction *> &DeadInsts,
Module *M) { Module *M) {
Type *ArgTy = Arg->getType(); Type *ArgTy = Arg->getType();
Type *ParamTy = PointerType::getUnqual(Type::getInt8Ty(ArgTy->getContext())); Type *ParamTy = PointerType::getUnqual(Type::getInt8Ty(ArgTy->getContext()));
DEBUG(dbgs() << "== ObjCARCOpt::MoveCalls ==\n");
// Insert the new retain and release calls. // Insert the new retain and release calls.
for (SmallPtrSet<Instruction *, 2>::const_iterator for (SmallPtrSet<Instruction *, 2>::const_iterator
PI = ReleasesToMove.ReverseInsertPts.begin(), PI = ReleasesToMove.ReverseInsertPts.begin(),
@@ -2308,10 +2296,8 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
Call->setDoesNotThrow(); Call->setDoesNotThrow();
Call->setTailCall(); Call->setTailCall();
DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Inserting new Release: " << *Call DEBUG(dbgs() << "Inserting new Release: " << *Call << "\n"
<< "\n" "At insertion point: " << *InsertPt << "\n");
" At insertion point: " << *InsertPt
<< "\n");
} }
for (SmallPtrSet<Instruction *, 2>::const_iterator for (SmallPtrSet<Instruction *, 2>::const_iterator
PI = RetainsToMove.ReverseInsertPts.begin(), PI = RetainsToMove.ReverseInsertPts.begin(),
@@ -2328,10 +2314,8 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
if (ReleasesToMove.IsTailCallRelease) if (ReleasesToMove.IsTailCallRelease)
Call->setTailCall(); Call->setTailCall();
DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Inserting new Retain: " << *Call DEBUG(dbgs() << "Inserting new Release: " << *Call << "\n"
<< "\n" "At insertion point: " << *InsertPt << "\n");
" At insertion point: " << *InsertPt
<< "\n");
} }
// Delete the original retain and release calls. // Delete the original retain and release calls.
@@ -2341,8 +2325,7 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
Instruction *OrigRetain = *AI; Instruction *OrigRetain = *AI;
Retains.blot(OrigRetain); Retains.blot(OrigRetain);
DeadInsts.push_back(OrigRetain); DeadInsts.push_back(OrigRetain);
DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Deleting retain: " << *OrigRetain << DEBUG(dbgs() << "Deleting retain: " << *OrigRetain << "\n");
"\n");
} }
for (SmallPtrSet<Instruction *, 2>::const_iterator for (SmallPtrSet<Instruction *, 2>::const_iterator
AI = ReleasesToMove.Calls.begin(), AI = ReleasesToMove.Calls.begin(),
@@ -2350,9 +2333,9 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
Instruction *OrigRelease = *AI; Instruction *OrigRelease = *AI;
Releases.erase(OrigRelease); Releases.erase(OrigRelease);
DeadInsts.push_back(OrigRelease); DeadInsts.push_back(OrigRelease);
DEBUG(dbgs() << "ObjCARCOpt::MoveCalls: Deleting release: " << *OrigRelease DEBUG(dbgs() << "Deleting release: " << *OrigRelease << "\n");
<< "\n");
} }
} }
bool bool
@@ -2524,6 +2507,8 @@ ObjCARCOpt::PerformCodePlacement(DenseMap<const BasicBlock *, BBState>
MapVector<Value *, RRInfo> &Retains, MapVector<Value *, RRInfo> &Retains,
DenseMap<Value *, RRInfo> &Releases, DenseMap<Value *, RRInfo> &Releases,
Module *M) { Module *M) {
DEBUG(dbgs() << "\n== ObjCARCOpt::PerformCodePlacement ==\n");
bool AnyPairsCompletelyEliminated = false; bool AnyPairsCompletelyEliminated = false;
RRInfo RetainsToMove; RRInfo RetainsToMove;
RRInfo ReleasesToMove; RRInfo ReleasesToMove;
@@ -2539,8 +2524,7 @@ ObjCARCOpt::PerformCodePlacement(DenseMap<const BasicBlock *, BBState>
Instruction *Retain = cast<Instruction>(V); Instruction *Retain = cast<Instruction>(V);
DEBUG(dbgs() << "ObjCARCOpt::PerformCodePlacement: Visiting: " << *Retain DEBUG(dbgs() << "Visiting: " << *Retain << "\n");
<< "\n");
Value *Arg = GetObjCArg(Retain); Value *Arg = GetObjCArg(Retain);
@@ -2597,14 +2581,15 @@ ObjCARCOpt::PerformCodePlacement(DenseMap<const BasicBlock *, BBState>
/// Weak pointer optimizations. /// Weak pointer optimizations.
void ObjCARCOpt::OptimizeWeakCalls(Function &F) { void ObjCARCOpt::OptimizeWeakCalls(Function &F) {
DEBUG(dbgs() << "\n== ObjCARCOpt::OptimizeWeakCalls ==\n");
// First, do memdep-style RLE and S2L optimizations. We can't use memdep // First, do memdep-style RLE and S2L optimizations. We can't use memdep
// itself because it uses AliasAnalysis and we need to do provenance // itself because it uses AliasAnalysis and we need to do provenance
// queries instead. // queries instead.
for (inst_iterator I = inst_begin(&F), E = inst_end(&F); I != E; ) { for (inst_iterator I = inst_begin(&F), E = inst_end(&F); I != E; ) {
Instruction *Inst = &*I++; Instruction *Inst = &*I++;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeWeakCalls: Visiting: " << *Inst << DEBUG(dbgs() << "Visiting: " << *Inst << "\n");
"\n");
InstructionClass Class = GetBasicInstructionClass(Inst); InstructionClass Class = GetBasicInstructionClass(Inst);
if (Class != IC_LoadWeak && Class != IC_LoadWeakRetained) if (Class != IC_LoadWeak && Class != IC_LoadWeakRetained)
@@ -2752,9 +2737,6 @@ void ObjCARCOpt::OptimizeWeakCalls(Function &F) {
done:; done:;
} }
} }
DEBUG(dbgs() << "ObjCARCOpt::OptimizeWeakCalls: Finished List.\n\n");
} }
/// Identify program paths which execute sequences of retains and releases which /// Identify program paths which execute sequences of retains and releases which
@@ -2872,14 +2854,16 @@ FindPredecessorAutoreleaseWithSafePath(const Value *Arg, BasicBlock *BB,
void ObjCARCOpt::OptimizeReturns(Function &F) { void ObjCARCOpt::OptimizeReturns(Function &F) {
if (!F.getReturnType()->isPointerTy()) if (!F.getReturnType()->isPointerTy())
return; return;
DEBUG(dbgs() << "\n== ObjCARCOpt::OptimizeReturns ==\n");
SmallPtrSet<Instruction *, 4> DependingInstructions; SmallPtrSet<Instruction *, 4> DependingInstructions;
SmallPtrSet<const BasicBlock *, 4> Visited; SmallPtrSet<const BasicBlock *, 4> Visited;
for (Function::iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI) { for (Function::iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI) {
BasicBlock *BB = FI; BasicBlock *BB = FI;
ReturnInst *Ret = dyn_cast<ReturnInst>(&BB->back()); ReturnInst *Ret = dyn_cast<ReturnInst>(&BB->back());
DEBUG(dbgs() << "ObjCARCOpt::OptimizeReturns: Visiting: " << *Ret << "\n"); DEBUG(dbgs() << "Visiting: " << *Ret << "\n");
if (!Ret) if (!Ret)
continue; continue;
@@ -2911,8 +2895,7 @@ void ObjCARCOpt::OptimizeReturns(Function &F) {
// If so, we can zap the retain and autorelease. // If so, we can zap the retain and autorelease.
Changed = true; Changed = true;
++NumRets; ++NumRets;
DEBUG(dbgs() << "ObjCARCOpt::OptimizeReturns: Erasing: " << *Retain DEBUG(dbgs() << "Erasing: " << *Retain << "\nErasing: "
<< "\n Erasing: "
<< *Autorelease << "\n"); << *Autorelease << "\n");
EraseInstruction(Retain); EraseInstruction(Retain);
EraseInstruction(Autorelease); EraseInstruction(Autorelease);
@@ -2923,9 +2906,6 @@ void ObjCARCOpt::OptimizeReturns(Function &F) {
DependingInstructions.clear(); DependingInstructions.clear();
Visited.clear(); Visited.clear();
} }
DEBUG(dbgs() << "ObjCARCOpt::OptimizeReturns: Finished List.\n\n");
} }
bool ObjCARCOpt::doInitialization(Module &M) { bool ObjCARCOpt::doInitialization(Module &M) {
@@ -2978,7 +2958,8 @@ bool ObjCARCOpt::runOnFunction(Function &F) {
Changed = false; Changed = false;
DEBUG(dbgs() << "ObjCARCOpt: Visiting Function: " << F.getName() << "\n"); DEBUG(dbgs() << "<<< ObjCARCOpt: Visiting Function: " << F.getName() << " >>>"
"\n");
PA.setAA(&getAnalysis<AliasAnalysis>()); PA.setAA(&getAnalysis<AliasAnalysis>());