From 933c3e1dca3bb88bf113290ef0ade8f5262a89c0 Mon Sep 17 00:00:00 2001 From: Zhongxing Xu Date: Tue, 21 Oct 2008 06:54:23 +0000 Subject: [PATCH] Localize the special processing of array variable inside GRExprEngine::VisitCast() so that other parts of the analyzer can be ignorant. When we cast "array of type T" to "pointer to T", we get the loc::MemRegionVal corresponding to the array variable. This is sufficient for BasicStore, but not for RegionStore. RegionStore should get the element region for the first array element in the cast. So next comes to the revamping of transfer functions for different store model. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57897 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/BasicStore.cpp | 1 + lib/Analysis/GRExprEngine.cpp | 16 ++-------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/Analysis/BasicStore.cpp b/lib/Analysis/BasicStore.cpp index c37db36640..b42f210dd8 100644 --- a/lib/Analysis/BasicStore.cpp +++ b/lib/Analysis/BasicStore.cpp @@ -78,6 +78,7 @@ public: StoreManager* clang::CreateBasicStoreManager(GRStateManager& StMgr) { return new BasicStoreManager(StMgr); } + SVal BasicStoreManager::getLValueVar(const GRState* St, const VarDecl* VD) { return loc::MemRegionVal(MRMgr.getVarRegion(VD)); } diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp index 32c83669e3..68f10b0d03 100644 --- a/lib/Analysis/GRExprEngine.cpp +++ b/lib/Analysis/GRExprEngine.cpp @@ -829,17 +829,6 @@ void GRExprEngine::VisitDeclRefExpr(DeclRefExpr* Ex, NodeTy* Pred, NodeSet& Dst, SVal V = StateMgr.GetLValue(St, VD); - if (VD->getType()->isArrayType()) { - // C++ standard says array of type T should be implicitly converted to - // pointer to type T in some cases. Currently we don't do this cast in - // VisitCast(), because BasicStore is not field sensitive. We shall do - // this in a transfer function in the future. We represent both lvalue and - // rvalue of array of type T as the corresponding MemRegionVal of it. - - MakeNode(Dst, Ex, Pred, SetSVal(St, Ex, V)); - return; - } - if (asLValue) MakeNode(Dst, Ex, Pred, SetSVal(St, Ex, V)); else @@ -1445,8 +1434,9 @@ void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME, void GRExprEngine::VisitCast(Expr* CastE, Expr* Ex, NodeTy* Pred, NodeSet& Dst){ NodeSet S1; QualType T = CastE->getType(); + QualType ExTy = Ex->getType(); - if (T->isReferenceType()) + if (ExTy->isArrayType() || T->isReferenceType()) VisitLValue(Ex, Pred, S1); else Visit(Ex, Pred, S1); @@ -1464,8 +1454,6 @@ void GRExprEngine::VisitCast(Expr* CastE, Expr* Ex, NodeTy* Pred, NodeSet& Dst){ // let the transfer function object be responsible for constructing // nodes. - QualType ExTy = Ex->getType(); - for (NodeSet::iterator I1 = S1.begin(), E1 = S1.end(); I1 != E1; ++I1) { NodeTy* N = *I1; const GRState* St = GetState(N); -- 2.40.0