Revert "[analyzer] Refactor conditional expression evaluating code"

This reverts commit r189090.

The original patch introduced regressions (see the added live-variables.* tests). The patch depends on the correctness of live variable analyses, which are not computed correctly. I've opened PR18159 to track the proper resolution to this problem.

The patch was a stepping block to r189746. This is why part of the patch reverts temporary destructor tests that started crashing. The temporary destructors feature is disabled by default.

llvm-svn: 196593

1 files changed, 23 insertions, 0 deletions

diff --git a/clang/test/Analysis/live-variables.cpp b/clang/test/Analysis/live-variables.cpp
new file mode 100644
index 00000000000..0cfaa1b41f5
--- /dev/null
+++ b/clang/test/Analysis/live-variables.cpp
@@ -0,0 +1,23 @@
+// RUN: %clang_cc1 -analyze -analyzer-checker=core -verify %s
+// expected-no-diagnostics
+class B {
+public:
+  bool m;
+  ~B() {} // The destructor ensures that the binary logical operator below is wrapped in the ExprWithCleanups.
+};
+B foo();
+int getBool();
+int *getPtr();
+int test() {
+  int r = 0;
+  for (int x = 0; x< 10; x++) {
+    int *p = getPtr();
+    // Liveness info is not computed correctly due to the following expression.
+    // This happens due to CFG being special cased for short circuit operators.
+    // PR18159
+    if (p != 0 && getBool() && foo().m && getBool()) {
+      r = *p; // no warning
+    }
+  }
+  return r;
+}