commit 5abd69d946374a8a40fe4fd47f95b49c24d9643a
author Ted Kremenek <kremenek@apple.com> Sat Feb 06 00:30:00 2010 +0000
committer Ted Kremenek <kremenek@apple.com> Sat Feb 06 00:30:00 2010 +0000
tree 2006e6e02941f9f104781e33075d33ed571526b7
parent ca972cd1f1e016cc144a47eb34bcca51e59a6fab

Teach RegionStore::InvalidateRegions() to also invalidate static variables referenced by blocks.

llvm-svn: 95459

clang/lib/Checker/MemRegion.cpp

diff --git a/clang/lib/Checker/MemRegion.cpp b/clang/lib/Checker/MemRegion.cpp
index 1e82883..cfa855e 100644
--- a/clang/lib/Checker/MemRegion.cpp
+++ b/clang/lib/Checker/MemRegion.cpp
@@ -759,7 +759,7 @@
     const VarDecl *VD = *I;
     const VarRegion *VR = 0;
     
-    if (!VD->getAttr<BlocksAttr>())
+    if (!VD->getAttr<BlocksAttr>() && VD->hasLocalStorage())
       VR = MemMgr.getVarRegion(VD, this);
     else {
       if (LC)

clang/lib/Checker/RegionStore.cpp

diff --git a/clang/lib/Checker/RegionStore.cpp b/clang/lib/Checker/RegionStore.cpp
index 528419f..341bfe7 100644
--- a/clang/lib/Checker/RegionStore.cpp
+++ b/clang/lib/Checker/RegionStore.cpp
@@ -606,10 +606,11 @@
     // by reference.
     if (const BlockDataRegion *BR = dyn_cast<BlockDataRegion>(baseR)) {
       for (BlockDataRegion::referenced_vars_iterator
-           I = BR->referenced_vars_begin(), E = BR->referenced_vars_end() ;
-           I != E; ++I) {
-        const VarRegion *VR = *I;
-        if (VR->getDecl()->getAttr<BlocksAttr>())
+           BI = BR->referenced_vars_begin(), BE = BR->referenced_vars_end() ;
+           BI != BE; ++BI) {
+        const VarRegion *VR = *BI;
+        const VarDecl *VD = VR->getDecl();
+        if (VD->getAttr<BlocksAttr>() || !VD->hasLocalStorage())
           AddToWorkList(VR);
       }
       continue;