From 3ab9e4cf87e902aecbef20c3cd2fa211f2bab387 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Wed, 16 Dec 2009 19:46:44 +0000 Subject: [PATCH] Temporarily revert 91553. llvm-svn: 91557 --- clang/lib/Analysis/BasicStore.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/clang/lib/Analysis/BasicStore.cpp b/clang/lib/Analysis/BasicStore.cpp index 237c1f9bf435..a38aaa7eb268 100644 --- a/clang/lib/Analysis/BasicStore.cpp +++ b/clang/lib/Analysis/BasicStore.cpp @@ -479,11 +479,15 @@ Store BasicStoreManager::getInitialStore(const LocationContext *InitLoc) { const Decl& CD = *InitLoc->getDecl(); if (const ObjCMethodDecl* MD = dyn_cast(&CD)) { if (MD->getSelfDecl() == PD) { - // FIXME: Add type constraints (when they become available) to - // SelfRegion? (i.e., it implements MD->getClassInterface()). - const MemRegion *SelfRegion = MRMgr.getVarRegion(PD, InitLoc); - St = BindInternal(St, ValMgr.makeLoc(SelfRegion), - ValMgr.getRegionValueSymbolVal(SelfRegion)); + // FIXME: Just use a symbolic region, and remove ObjCObjectRegion + // entirely. + const ObjCObjectRegion *SelfRegion = + MRMgr.getObjCObjectRegion(MD->getClassInterface(), + MRMgr.getHeapRegion()); + + St = BindInternal(St, ValMgr.makeLoc(MRMgr.getVarRegion(PD, InitLoc)), + ValMgr.makeLoc(SelfRegion)); + // Scan the method for ivar references. While this requires an // entire AST scan, the cost should not be high in practice. St = scanForIvars(MD->getBody(), PD, SelfRegion, St); -- GitLab