1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 58d8670d30..fe0ae17203 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -620,8 +620,13 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) {
   if (const VarRegion* VR = dyn_cast<VarRegion>(R)) {
     const VarDecl *VD = VR->getDecl();
     
-    if (isa<ParmVarDecl>(VD))
-      return SVal::GetRValueSymbolVal(getSymbolManager(), VR);
+    if (isa<ParmVarDecl>(VD) || VD->hasGlobalStorage()) {
+      QualType VTy = VD->getType();
+      if (Loc::IsLocType(VTy) || VTy->isIntegerType())
+        return SVal::GetRValueSymbolVal(getSymbolManager(), VR);
+      else
+        return UnknownVal();
+    }
     else if (VD == SelfDecl)
       return loc::MemRegionVal(getSelfRegion(0));
   }