1 files changed, 7 insertions, 8 deletions
diff --git a/clang/include/clang/Checker/PathSensitive/Store.h b/clang/include/clang/Checker/PathSensitive/Store.h
index c2e5436adbd..67b90b3e1e1 100644
--- a/clang/include/clang/Checker/PathSensitive/Store.h
+++ b/clang/include/clang/Checker/PathSensitive/Store.h
@@ -15,8 +15,7 @@
 #define LLVM_CLANG_ANALYSIS_STORE_H
 
 #include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/Checker/PathSensitive/ValueManager.h"
+#include "clang/Checker/PathSensitive/SValBuilder.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/Optional.h"
 
@@ -38,7 +37,7 @@ class StackFrameContext;
 
 class StoreManager {
 protected:
-  ValueManager &ValMgr;
+  SValBuilder &svalBuilder;
   GRStateManager &StateMgr;
 
   /// MRMgr - Manages region objects associated with this StoreManager.
@@ -96,11 +95,11 @@ public:
   virtual SubRegionMap *getSubRegionMap(Store store) = 0;
 
   virtual Loc getLValueVar(const VarDecl *VD, const LocationContext *LC) {
-    return ValMgr.makeLoc(MRMgr.getVarRegion(VD, LC));
+    return svalBuilder.makeLoc(MRMgr.getVarRegion(VD, LC));
   }
 
   virtual Loc getLValueString(const StringLiteral* S) {
-    return ValMgr.makeLoc(MRMgr.getStringRegion(S));
+    return svalBuilder.makeLoc(MRMgr.getStringRegion(S));
   }
 
   Loc getLValueCompoundLiteral(const CompoundLiteralExpr* CL,
@@ -215,17 +214,17 @@ public:
   virtual void iterBindings(Store store, BindingsHandler& f) = 0;
 
 protected:
-  const MemRegion *MakeElementRegion(const MemRegion *Base,
+  const MemRegion *MakeElementRegion(const MemRegion *baseRegion,
                                      QualType pointeeTy, uint64_t index = 0);
 
   /// CastRetrievedVal - Used by subclasses of StoreManager to implement
   ///  implicit casts that arise from loads from regions that are reinterpreted
   ///  as another region.
-  SVal CastRetrievedVal(SVal val, const TypedRegion *R, QualType castTy,
+  SVal CastRetrievedVal(SVal val, const TypedRegion *region, QualType castTy,
                         bool performTestOnly = true);
 
 private:
-  SVal getLValueFieldOrIvar(const Decl* D, SVal Base);
+  SVal getLValueFieldOrIvar(const Decl* decl, SVal base);
 };
 
 // FIXME: Do we still need this?