From 36d02e0984fcb7bdae37df7659603075c2a4c113 Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Mon, 8 Feb 2010 05:40:07 +0000 Subject: [PATCH] Add support for binding and retrieving VarRegions in flat store. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@95529 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Checker/FlatStore.cpp | 73 +++++++++++++++++++++++++----- test/Analysis/misc-ps-flat-store.c | 10 ++++ 2 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 test/Analysis/misc-ps-flat-store.c diff --git a/lib/Checker/FlatStore.cpp b/lib/Checker/FlatStore.cpp index 4622f47877..ca182708e1 100644 --- a/lib/Checker/FlatStore.cpp +++ b/lib/Checker/FlatStore.cpp @@ -11,6 +11,7 @@ #include "llvm/ADT/ImmutableIntervalMap.h" using namespace clang; +using llvm::Interval; // The actual store type. typedef llvm::ImmutableIntervalMap BindingVal; @@ -27,8 +28,8 @@ public: RBFactory(mgr.getAllocator()), BVFactory(mgr.getAllocator()) {} - SVal Retrieve(Store store, Loc loc, QualType T); - Store Bind(Store store, Loc loc, SVal val); + SVal Retrieve(Store store, Loc L, QualType T); + Store Bind(Store store, Loc L, SVal val); Store Remove(Store St, Loc L); Store BindCompoundLiteral(Store store, const CompoundLiteralExpr* cl, const LocationContext *LC, SVal v); @@ -41,7 +42,9 @@ public: return 0; } - SVal getLValueVar(const VarDecl *VD, const LocationContext *LC); + SVal getLValueVar(const VarDecl *VD, const LocationContext *LC) { + return loc::MemRegionVal(MRMgr.getVarRegion(VD, LC)); + } SVal getLValueString(const StringLiteral* sl); SVal getLValueIvar(const ObjCIvarDecl* decl, SVal base); @@ -65,6 +68,15 @@ public: void print(Store store, llvm::raw_ostream& Out, const char* nl, const char *sep); void iterBindings(Store store, BindingsHandler& f); + +private: + static RegionBindings getRegionBindings(Store store) { + return RegionBindings(static_cast(store)); + } + + Interval RegionToInterval(const MemRegion *R); + + SVal RetrieveRegionWithNoBinding(const MemRegion *R, QualType T); }; } // end anonymous namespace @@ -72,12 +84,42 @@ StoreManager *clang::CreateFlatStoreManager(GRStateManager &StMgr) { return new FlatStoreManager(StMgr); } -SVal FlatStoreManager::Retrieve(Store store, Loc loc, QualType T) { - return UnknownVal(); +SVal FlatStoreManager::Retrieve(Store store, Loc L, QualType T) { + const MemRegion *R = cast(L).getRegion(); + Interval I = RegionToInterval(R); + RegionBindings B = getRegionBindings(store); + const BindingVal *BV = B.lookup(R); + if (BV) { + const SVal *V = BVFactory.Lookup(*BV, I); + if (V) + return *V; + else + return RetrieveRegionWithNoBinding(R, T); + } + return RetrieveRegionWithNoBinding(R, T); } -Store FlatStoreManager::Bind(Store store, Loc loc, SVal val) { - return store; +SVal FlatStoreManager::RetrieveRegionWithNoBinding(const MemRegion *R, + QualType T) { + if (R->hasStackNonParametersStorage()) + return UndefinedVal(); + else + return ValMgr.getRegionValueSymbolVal(R, T); +} + +Store FlatStoreManager::Bind(Store store, Loc L, SVal val) { + const MemRegion *R = cast(L).getRegion(); + RegionBindings B = getRegionBindings(store); + const BindingVal *V = B.lookup(R); + + BindingVal BV = BVFactory.GetEmptyMap(); + if (V) + BV = *V; + + Interval I = RegionToInterval(R); + BV = BVFactory.Add(BV, I, val); + B = RBFactory.Add(B, R, BV); + return B.getRoot(); } Store FlatStoreManager::Remove(Store store, Loc L) { @@ -91,11 +133,6 @@ Store FlatStoreManager::BindCompoundLiteral(Store store, return store; } -SVal FlatStoreManager::getLValueVar(const VarDecl *VD, - const LocationContext *LC) { - return UnknownVal(); -} - SVal FlatStoreManager::getLValueString(const StringLiteral* sl) { return UnknownVal(); } @@ -138,3 +175,15 @@ void FlatStoreManager::print(Store store, llvm::raw_ostream& Out, void FlatStoreManager::iterBindings(Store store, BindingsHandler& f) { } + +Interval FlatStoreManager::RegionToInterval(const MemRegion *R) { + switch (R->getKind()) { + case MemRegion::VarRegionKind: { + QualType T = cast(R)->getValueType(StateMgr.getContext()); + uint64_t Size = StateMgr.getContext().getTypeSize(T); + return Interval(0, Size-1); + } + default: + assert(0 && "Region kind unhandled."); + } +} diff --git a/test/Analysis/misc-ps-flat-store.c b/test/Analysis/misc-ps-flat-store.c new file mode 100644 index 0000000000..8cbcecf51f --- /dev/null +++ b/test/Analysis/misc-ps-flat-store.c @@ -0,0 +1,10 @@ +// RUN: %clang_cc1 -analyze -analyzer-check-objc-mem -analyzer-store=flat -verify %s + +void f1() { + int x; + int *p; + x = 1; + p = 0; + if (x != 1) + *p = 1; // no-warning +} -- 2.40.0