From 7c03013c8b595d0c12ef1cc01f6b77918bc637df Mon Sep 17 00:00:00 2001
From: Manuel Klimek <klimek@google.com>
Date: Thu, 7 Aug 2014 16:05:51 +0000
Subject: [PATCH] Model temporary destructors from logical operators with known
 values.

If the truth value of a LHS is known, we can build the knowledge whether
a temporary destructor is executed or not into the CFG. This is needed
by the return type analysis.

llvm-svn: 215118
---
 clang/lib/Analysis/CFG.cpp             | 19 +++++++++++++++----
 clang/test/SemaCXX/return-noreturn.cpp | 16 ++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index b9698d550bfb..96571fdbecd6 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -3631,12 +3631,23 @@ CFGBlock *CFGBuilder::VisitBinaryOperatorForTemporaryDtors(
     BinaryOperator *E, TempDtorContext &Context) {
   if (E->isLogicalOp()) {
     VisitForTemporaryDtors(E->getLHS(), false, Context);
-    // We do not know at CFG-construction time whether the right-hand-side was
-    // executed, thus we add a branch node that depends on the temporary
-    // constructor call.
+    TryResult LHSVal = tryEvaluateBool(E->getLHS());
+    bool RHSNotExecuted = (E->getOpcode() == BO_LAnd && LHSVal.isFalse()) ||
+                          (E->getOpcode() == BO_LOr && LHSVal.isTrue());
+    if (RHSNotExecuted) {
+      return Block;
+    }
+
     TempDtorContext RHSContext(/*IsConditional=*/true);
     VisitForTemporaryDtors(E->getRHS(), false, RHSContext);
-    InsertTempDtorDecisionBlock(RHSContext);
+
+    // If the LHS is known, and the RHS is not executed, we returned above.
+    // Thus, once we arrive here, and the LHS is known, we also know that the
+    // RHS was executed and can execute the RHS unconditionally (that is, we
+    // don't insert a decision block).
+    if (!LHSVal.isKnown())
+      InsertTempDtorDecisionBlock(RHSContext);
+
     return Block;
   }
 
diff --git a/clang/test/SemaCXX/return-noreturn.cpp b/clang/test/SemaCXX/return-noreturn.cpp
index 8490be9be382..519d27cf0b8d 100644
--- a/clang/test/SemaCXX/return-noreturn.cpp
+++ b/clang/test/SemaCXX/return-noreturn.cpp
@@ -183,6 +183,22 @@ int testTernaryConditionalNoreturnFalseBranch(bool value) {
   value ? Return() : (NoReturn() || NoReturn());
 } // expected-warning {{control may reach end of non-void function}}
 
+int testStaticallyExecutedLogicalOrBranch() {
+  false || NoReturn();
+}
+
+int testStaticallyExecutedLogicalAndBranch() {
+  true && NoReturn();
+}
+
+int testStaticallySkippedLogicalOrBranch() {
+  true || NoReturn();
+} // expected-warning {{control reaches end of non-void function}}
+
+int testStaticallySkppedLogicalAndBranch() {
+  false && NoReturn();
+} // expected-warning {{control reaches end of non-void function}}
+
 
 #if __cplusplus >= 201103L
 namespace LambdaVsTemporaryDtor {