diff options
| -rw-r--r-- | lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp | 12 | ||||
| -rw-r--r-- | lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp index 91219c4..ae728dd 100644 --- a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp +++ b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp @@ -406,8 +406,10 @@ Instruction *InstCombiner::visitStoreInst(StoreInst &SI) { for (unsigned ScanInsts = 6; BBI != SI.getParent()->begin() && ScanInsts; --ScanInsts) { --BBI; - // Don't count debug info directives, lest they affect codegen - if (isa<DbgInfoIntrinsic>(BBI)) { + // Don't count debug info directives, lest they affect codegen, + // and we skip pointer-to-pointer bitcasts, which are NOPs. + if (isa<DbgInfoIntrinsic>(BBI) || + (isa<BitCastInst>(BBI) && isa<PointerType>(BBI->getType()))) { ScanInsts++; continue; } @@ -476,7 +478,8 @@ Instruction *InstCombiner::visitStoreInst(StoreInst &SI) { BBI = &SI; do { ++BBI; - } while (isa<DbgInfoIntrinsic>(BBI)); + } while (isa<DbgInfoIntrinsic>(BBI) || + (isa<BitCastInst>(BBI) && isa<PointerType>(BBI->getType()))); if (BranchInst *BI = dyn_cast<BranchInst>(BBI)) if (BI->isUnconditional()) if (SimplifyStoreAtEndOfBlock(SI)) @@ -536,7 +539,8 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) { if (OtherBr->isUnconditional()) { --BBI; // Skip over debugging info. - while (isa<DbgInfoIntrinsic>(BBI)) { + while (isa<DbgInfoIntrinsic>(BBI) || + (isa<BitCastInst>(BBI) && isa<PointerType>(BBI->getType()))) { if (BBI==OtherBB->begin()) return false; --BBI; diff --git a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp index 291d320..9fdcfe5 100644 --- a/lib/Transforms/Utils/PromoteMemoryToRegister.cpp +++ b/lib/Transforms/Utils/PromoteMemoryToRegister.cpp @@ -76,9 +76,6 @@ bool llvm::isAllocaPromotable(const AllocaInst *AI) { return false; // Don't allow a store OF the AI, only INTO the AI. if (SI->isVolatile()) return false; - } else if (isa<BitCastInst>(*UI)) { - // A bitcast inhibits promotion. - return false; } else { return false; } |