From 4084c4ee342a6600e2c40b4f37f0b881443aeefa Mon Sep 17 00:00:00 2001 From: Dale Johannesen Date: Thu, 5 Mar 2009 02:06:48 +0000 Subject: [PATCH] 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 --- .../Scalar/InstructionCombining.cpp | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 1679b9f4bca..86f3256a6ee 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -11565,9 +11565,15 @@ Instruction *InstCombiner::visitStoreInst(StoreInst &SI) { return Res; - // If this store is the last instruction in the basic block, and if the block - // ends with an unconditional branch, try to move it to the successor block. - BBI = &SI; ++BBI; + // If this store is the last instruction in the basic block (possibly + // excepting debug info instructions and the pointer bitcasts that feed + // 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(BBI) || + (isa(BBI) && isa(BBI->getType()))); if (BranchInst *BI = dyn_cast(BBI)) if (BI->isUnconditional()) if (SimplifyStoreAtEndOfBlock(SI)) @@ -11625,8 +11631,15 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) { // else' case. there is an instruction before the branch. StoreInst *OtherStore = 0; if (OtherBr->isUnconditional()) { - // If this isn't a store, or isn't a store to the same location, bail out. --BBI; + // Skip over debugging info. + while (isa(BBI) || + (isa(BBI) && isa(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(BBI); if (!OtherStore || OtherStore->getOperand(1) != SI.getOperand(1)) return false; -- 2.34.1