1 files changed, 5 insertions, 3 deletions
diff --git a/clang/lib/Analysis/RegionStore.cpp b/clang/lib/Analysis/RegionStore.cpp
index 7bae5e4487b..a05a42fdc39 100644
--- a/clang/lib/Analysis/RegionStore.cpp
+++ b/clang/lib/Analysis/RegionStore.cpp
@@ -704,15 +704,17 @@ 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) || VD->hasGlobalStorage()) {
+    if (VD == SelfDecl)
+      return loc::MemRegionVal(getSelfRegion(0));
+    
+    if (isa<ParmVarDecl>(VD) || isa<ImplicitParamDecl>(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));
   }