Revert "[analyzer][CFG] Return the correct terminator condition"

This reverts commit 7a57118a6fcfa3770f984453543bbdfd0b233e84.

Causes a bunch of crashes, I need to time to evaluate this.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@365037 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 5 deletions

diff --git a/include/clang/Analysis/CFG.h b/include/clang/Analysis/CFG.h
index 945d36498c..d8b3d6ff71 100644
--- a/include/clang/Analysis/CFG.h
+++ b/include/clang/Analysis/CFG.h
@@ -860,12 +860,10 @@ public:
   Stmt *getTerminatorStmt() { return Terminator.getStmt(); }
   const Stmt *getTerminatorStmt() const { return Terminator.getStmt(); }
 
-  /// \returns the condition of the terminator (condition of an if statement,
-  /// for loop, etc).
-  const Stmt *getTerminatorCondition(bool StripParens = true) const;
+  Stmt *getTerminatorCondition(bool StripParens = true);
 
-  const Expr *getTerminatorConditionExpr(bool StripParens = true) const {
-    return dyn_cast_or_null<Expr>(getTerminatorCondition(StripParens));
+  const Stmt *getTerminatorCondition(bool StripParens = true) const {
+    return const_cast<CFGBlock*>(this)->getTerminatorCondition(StripParens);
   }
 
   const Stmt *getLoopTarget() const { return LoopTarget; }