3 files changed, 8 insertions, 9 deletions
diff --git a/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h b/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 9c401bedc2e..29acc707da6 100644
--- a/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/clang/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -63,6 +63,9 @@ protected:
   /// SymMgr - Object that manages the symbol information.
   SymbolManager& SymMgr;
   
+  /// ValMgr - Object that manages/creates SVals.
+  ValueManager &ValMgr;
+  
   /// EntryNode - The immediate predecessor node.
   NodeTy* EntryNode;
 
@@ -465,13 +468,8 @@ public:
     return StateMgr.getBasicVals();
   }
   
-  ValueManager &getValueManager() {
-    return StateMgr.getValueManager();
-  }
-  
-  const ValueManager &getValueManager() const {
-    return StateMgr.getValueManager();
-  }
+  ValueManager &getValueManager() { return ValMgr; }  
+  const ValueManager &getValueManager() const { return ValMgr; }
   
   // FIXME: Remove when we migrate over to just using ValueManager.
   SymbolManager& getSymbolManager() { return SymMgr; }
diff --git a/clang/include/clang/Analysis/PathSensitive/SVals.h b/clang/include/clang/Analysis/PathSensitive/SVals.h
index f3a2d369e75..df407801815 100644
--- a/clang/include/clang/Analysis/PathSensitive/SVals.h
+++ b/clang/include/clang/Analysis/PathSensitive/SVals.h
@@ -97,8 +97,6 @@ public:
     return getRawKind() > UnknownKind;
   }
   
-  static SVal MakeZero(BasicValueFactory &BasicVals, QualType T);
-  
   bool isZeroConstant() const;
   
   /// getAsLocSymbol - If this SVal is a location (subclasses Loc) and 
diff --git a/clang/include/clang/Analysis/PathSensitive/ValueManager.h b/clang/include/clang/Analysis/PathSensitive/ValueManager.h
index b60c86d31a9..28aa791c023 100644
--- a/clang/include/clang/Analysis/PathSensitive/ValueManager.h
+++ b/clang/include/clang/Analysis/PathSensitive/ValueManager.h
@@ -77,6 +77,9 @@ public:
   Loc makeRegionVal(SymbolRef Sym) {
     return Loc::MakeVal(MemMgr->getSymbolicRegion(Sym));
   }
+  
+  /// makeZeroVal - Construct an SVal representing '0' for the specified type.
+  SVal makeZeroVal(QualType T);
 };
 } // end clang namespace
 #endif