commit e14e7bc4b889dfaffb7180d176a03311df2d4ae6
author David Majnemer <david.majnemer@gmail.com> Sat Jun 25 08:19:55 2016 +0000
committer David Majnemer <david.majnemer@gmail.com> Sat Jun 25 08:19:55 2016 +0000
tree 625378805831c8775357f4cc7ff0f2eb834a7511
parent d346a377375a4780c95f4d30150bdeaed1a35b65

Revert "[SimplifyCFG] Stop inserting calls to llvm.trap for UB"

This reverts commit r273778, it seems to break UBSan :/

llvm-svn: 273779

llvm/lib/Transforms/Utils/LoopSimplify.cpp

diff --git a/llvm/lib/Transforms/Utils/LoopSimplify.cpp b/llvm/lib/Transforms/Utils/LoopSimplify.cpp
index a2dd581..2509b0a 100644
--- a/llvm/lib/Transforms/Utils/LoopSimplify.cpp
+++ b/llvm/lib/Transforms/Utils/LoopSimplify.cpp
@@ -491,7 +491,7 @@
 
       // Zap the dead pred's terminator and replace it with unreachable.
       TerminatorInst *TI = P->getTerminator();
-      changeToUnreachable(TI);
+      changeToUnreachable(TI, /*UseLLVMTrap=*/false);
       Changed = true;
     }
   }