Fix another case where debug info was affecting

codegen.  I convinced myself it was OK to skip all
pointer bitcasts here too.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66122 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dale Johannesen 2009-03-05 02:06:48 +00:00
parent 9b89f0de12
commit 4084c4ee34

View File

@ -11565,9 +11565,15 @@ Instruction *InstCombiner::visitStoreInst(StoreInst &SI) {
return Res; return Res;
// If this store is the last instruction in the basic block, and if the block // If this store is the last instruction in the basic block (possibly
// ends with an unconditional branch, try to move it to the successor block. // excepting debug info instructions and the pointer bitcasts that feed
BBI = &SI; ++BBI; // into them), and if the block ends with an unconditional branch, try
// to move it to the successor block.
BBI = &SI;
do {
++BBI;
} while (isa<DbgInfoIntrinsic>(BBI) ||
(isa<BitCastInst>(BBI) && isa<PointerType>(BBI->getType())));
if (BranchInst *BI = dyn_cast<BranchInst>(BBI)) if (BranchInst *BI = dyn_cast<BranchInst>(BBI))
if (BI->isUnconditional()) if (BI->isUnconditional())
if (SimplifyStoreAtEndOfBlock(SI)) if (SimplifyStoreAtEndOfBlock(SI))
@ -11625,8 +11631,15 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) {
// else' case. there is an instruction before the branch. // else' case. there is an instruction before the branch.
StoreInst *OtherStore = 0; StoreInst *OtherStore = 0;
if (OtherBr->isUnconditional()) { if (OtherBr->isUnconditional()) {
// If this isn't a store, or isn't a store to the same location, bail out.
--BBI; --BBI;
// Skip over debugging info.
while (isa<DbgInfoIntrinsic>(BBI) ||
(isa<BitCastInst>(BBI) && isa<PointerType>(BBI->getType()))) {
if (BBI==OtherBB->begin())
return false;
--BBI;
}
// If this isn't a store, or isn't a store to the same location, bail out.
OtherStore = dyn_cast<StoreInst>(BBI); OtherStore = dyn_cast<StoreInst>(BBI);
if (!OtherStore || OtherStore->getOperand(1) != SI.getOperand(1)) if (!OtherStore || OtherStore->getOperand(1) != SI.getOperand(1))
return false; return false;