another fix for PR3354


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@62561 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 1a4f573..d891eeb 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -1559,6 +1559,11 @@
   // fold the conditions into logical ops and one cond br.
   if (&BB->front() != BI)
     return false;
+
+  
+  if (ConstantExpr *CE = dyn_cast<ConstantExpr>(BI->getCondition()))
+    if (CE->canTrap())
+      return false;
   
   int PBIOp, BIOp;
   if (PBI->getSuccessor(0) == BI->getSuccessor(0))