Only have one path in the CFG for ternaries if the condition is known.

The return type analysis requires that the CFG is simplified when the
truth values of branches are statically known at analysis time.

llvm-svn: 215114

1 files changed, 11 insertions, 2 deletions

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index 20438b47877..b9698d550bf 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -3711,15 +3711,24 @@ CFGBlock *CFGBuilder::VisitConditionalOperatorForTemporaryDtors(
   VisitForTemporaryDtors(E->getCond(), false, Context);
   CFGBlock *ConditionBlock = Block;
   CFGBlock *ConditionSucc = Succ;
+  TryResult ConditionVal = tryEvaluateBool(E->getCond());
 
   TempDtorContext TrueContext(/*IsConditional=*/true);
-  VisitForTemporaryDtors(E->getTrueExpr(), BindToTemporary, TrueContext);
+  if (!ConditionVal.isFalse()) {
+    VisitForTemporaryDtors(E->getTrueExpr(), BindToTemporary, TrueContext);
+    if (ConditionVal.isTrue())
+      return Block;
+  }
   CFGBlock *TrueBlock = Block;
 
   Block = ConditionBlock;
   Succ = ConditionSucc;
   TempDtorContext FalseContext(/*IsConditional=*/true);
-  VisitForTemporaryDtors(E->getFalseExpr(), BindToTemporary, FalseContext);
+  if (!ConditionVal.isTrue()) {
+    VisitForTemporaryDtors(E->getFalseExpr(), BindToTemporary, FalseContext);
+    if (ConditionVal.isFalse())
+      return Block;
+  }
 
   if (TrueContext.TerminatorExpr && FalseContext.TerminatorExpr) {
     InsertTempDtorDecisionBlock(FalseContext, TrueBlock);