Remove redundant logic.

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

2 files changed, 3 insertions, 18 deletions

diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 752f5cbe8a..bb805ba092 100644
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -391,9 +391,9 @@ protected:
   
 public:
   
-  // FIXME: Maybe make these accesible only within the StmtBuilder?
-  
-  const ValueState* SetRVal(const ValueState* St, Expr* Ex, RVal V);
+  const ValueState* SetRVal(const ValueState* St, Expr* Ex, RVal V) {
+    return StateMgr.SetRVal(St, Ex, V);
+  }
   
   const ValueState* SetRVal(const ValueState* St, const Expr* Ex, RVal V) {
     return SetRVal(St, const_cast<Expr*>(Ex), V);
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index e32fd0b331..5159f4a4cd 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -217,21 +217,6 @@ const ValueState* GRExprEngine::getInitialState() {
   }
   
   return StateMgr.getPersistentState(StateImpl);
-}      
-      
-const ValueState* GRExprEngine::SetRVal(const ValueState* St, Expr* Ex,
-                                        RVal V) {
-
-  bool isBlkExpr = false;
-    
-  if (Ex == CurrentStmt) {
-    isBlkExpr = getCFG().isBlkExpr(Ex);
-    
-    if (!isBlkExpr)
-      return St;
-  }
-
-  return StateMgr.SetRVal(St, Ex, V, isBlkExpr, true);
 }
 
 //===----------------------------------------------------------------------===//