1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index cb423e18af..f4ffcb12e0 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -202,6 +202,15 @@ const GRState* GRExprEngine::getInitialState() {
     
     ScopedDecl *SD = const_cast<ScopedDecl*>(I->first);
     if (VarDecl* VD = dyn_cast<VarDecl>(SD)) {
+      // Punt on static variables for now.
+      if (VD->getStorageClass() ==  VarDecl::Static)
+        continue;
+      
+      // Only handle pointers and integers for now.
+      QualType T = VD->getType();      
+      if (!(LVal::IsLValType(T) || T->isIntegerType()))
+        continue;
+      
       // Initialize globals and parameters to symbolic values.
       // Initialize local variables to undefined.
       RVal X = (VD->hasGlobalStorage() || isa<ParmVarDecl>(VD) ||