aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Checker/PathSensitive/Store.h1
-rw-r--r--lib/Checker/FlatStore.cpp4
-rw-r--r--lib/Checker/Store.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/include/clang/Checker/PathSensitive/Store.h b/include/clang/Checker/PathSensitive/Store.h
index 3121e461bc..7d93688344 100644
--- a/include/clang/Checker/PathSensitive/Store.h
+++ b/include/clang/Checker/PathSensitive/Store.h
@@ -41,6 +41,7 @@ protected:
/// MRMgr - Manages region objects associated with this StoreManager.
MemRegionManager &MRMgr;
+ ASTContext &Ctx;
StoreManager(GRStateManager &stateMgr);
diff --git a/lib/Checker/FlatStore.cpp b/lib/Checker/FlatStore.cpp
index ca182708e1..fdeeab9529 100644
--- a/lib/Checker/FlatStore.cpp
+++ b/lib/Checker/FlatStore.cpp
@@ -179,8 +179,8 @@ void FlatStoreManager::iterBindings(Store store, BindingsHandler& f) {
Interval FlatStoreManager::RegionToInterval(const MemRegion *R) {
switch (R->getKind()) {
case MemRegion::VarRegionKind: {
- QualType T = cast<VarRegion>(R)->getValueType(StateMgr.getContext());
- uint64_t Size = StateMgr.getContext().getTypeSize(T);
+ QualType T = cast<VarRegion>(R)->getValueType(Ctx);
+ uint64_t Size = Ctx.getTypeSize(T);
return Interval(0, Size-1);
}
default:
diff --git a/lib/Checker/Store.cpp b/lib/Checker/Store.cpp
index c7746a6dec..5893733c54 100644
--- a/lib/Checker/Store.cpp
+++ b/lib/Checker/Store.cpp
@@ -19,7 +19,7 @@ using namespace clang;
StoreManager::StoreManager(GRStateManager &stateMgr)
: ValMgr(stateMgr.getValueManager()), StateMgr(stateMgr),
- MRMgr(ValMgr.getRegionManager()) {}
+ MRMgr(ValMgr.getRegionManager()), Ctx(stateMgr.getContext()) {}
const MemRegion *StoreManager::MakeElementRegion(const MemRegion *Base,
QualType EleTy, uint64_t index) {