diff options
Diffstat (limited to 'lib/Transforms/Scalar/SimplifyCFGPass.cpp')
| -rw-r--r-- | lib/Transforms/Scalar/SimplifyCFGPass.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/lib/Transforms/Scalar/SimplifyCFGPass.cpp index 155d5d81e3..f6cffdd0ef 100644 --- a/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -109,8 +109,6 @@ static bool MarkAliveBlocks(BasicBlock *BB, if (!Reachable.insert(BB)) continue; - bool AsmFound = false; - StoreInst *UndefStore = 0; // Do a quick scan of the basic block, turning any obviously unreachable // instructions into LLVM unreachable insts. The instruction combining pass // canonicalizes unreachable insts into stores to null or undef. @@ -127,27 +125,20 @@ static bool MarkAliveBlocks(BasicBlock *BB, } break; } - if (isa<InlineAsm>(CI->getOperand(0))) - AsmFound = true; } if (StoreInst *SI = dyn_cast<StoreInst>(BBI)) { Value *Ptr = SI->getOperand(1); - - if ((isa<UndefValue>(Ptr) || - (isa<ConstantPointerNull>(Ptr) && - cast<PointerType>(Ptr->getType())->getAddressSpace() == 0)) && - !UndefStore) - UndefStore = SI; + + if (isa<UndefValue>(Ptr) || + (isa<ConstantPointerNull>(Ptr) && + cast<PointerType>(Ptr->getType())->getAddressSpace() == 0)) { + ChangeToUnreachable(SI, Context); + Changed = true; + break; + } } } - // We can't delete asm's just because their inputs are undefined; - // xor R, R is a common idiom for zeroing a register, for example. - // Assume user knows what he is doing. - if (UndefStore && !AsmFound) { - ChangeToUnreachable(UndefStore, Context); - Changed = true; - } // Turn invokes that call 'nounwind' functions into ordinary calls. if (InvokeInst *II = dyn_cast<InvokeInst>(BB->getTerminator())) |