diff options
author | David Majnemer <david.majnemer@gmail.com> | 2016-06-25 08:19:55 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2016-06-25 08:19:55 +0000 |
commit | e14e7bc4b889dfaffb7180d176a03311df2d4ae6 (patch) | |
tree | 625378805831c8775357f4cc7ff0f2eb834a7511 /llvm/lib/Transforms/Scalar | |
parent | d346a377375a4780c95f4d30150bdeaed1a35b65 (diff) | |
download | bcm5719-llvm-e14e7bc4b889dfaffb7180d176a03311df2d4ae6.tar.gz bcm5719-llvm-e14e7bc4b889dfaffb7180d176a03311df2d4ae6.zip |
Revert "[SimplifyCFG] Stop inserting calls to llvm.trap for UB"
This reverts commit r273778, it seems to break UBSan :/
llvm-svn: 273779
Diffstat (limited to 'llvm/lib/Transforms/Scalar')
-rw-r--r-- | llvm/lib/Transforms/Scalar/SCCP.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/SCCP.cpp b/llvm/lib/Transforms/Scalar/SCCP.cpp index 264bdb6f353..91e625b7aac 100644 --- a/llvm/lib/Transforms/Scalar/SCCP.cpp +++ b/llvm/lib/Transforms/Scalar/SCCP.cpp @@ -1802,7 +1802,8 @@ static bool runIPSCCP(Module &M, const DataLayout &DL, DEBUG(dbgs() << " BasicBlock Dead:" << *BB); ++NumDeadBlocks; - NumInstRemoved += changeToUnreachable(BB->getFirstNonPHI()); + NumInstRemoved += + changeToUnreachable(BB->getFirstNonPHI(), /*UseLLVMTrap=*/false); MadeChanges = true; |