diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-06-12 21:01:07 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-06-12 21:01:07 +0000 |
| commit | 3d602dd115555296da21ad2f5edd8e1a1136a24f (patch) | |
| tree | ff80d63f7b1e173acdf7a86363635d5842ee1820 /lib/Transforms | |
| parent | d97d714f5b5046ea448e7688705db449c8b54536 (diff) | |
| download | external_llvm-3d602dd115555296da21ad2f5edd8e1a1136a24f.zip external_llvm-3d602dd115555296da21ad2f5edd8e1a1136a24f.tar.gz external_llvm-3d602dd115555296da21ad2f5edd8e1a1136a24f.tar.bz2 | |
second half of fix for PR4366: don't zap store to null of
non-default addrspaces.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@73253 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/Scalar/SimplifyCFGPass.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/lib/Transforms/Scalar/SimplifyCFGPass.cpp index b499279..5a85a04 100644 --- a/lib/Transforms/Scalar/SimplifyCFGPass.cpp +++ b/lib/Transforms/Scalar/SimplifyCFGPass.cpp @@ -125,13 +125,17 @@ static bool MarkAliveBlocks(BasicBlock *BB, } } - if (StoreInst *SI = dyn_cast<StoreInst>(BBI)) - if (isa<ConstantPointerNull>(SI->getOperand(1)) || - isa<UndefValue>(SI->getOperand(1))) { + 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)) { ChangeToUnreachable(SI); Changed = true; break; } + } } // Turn invokes that call 'nounwind' functions into ordinary calls. |