1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index 2e82cc665c..f519d4d1cd 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -576,6 +576,15 @@ SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) {
   if (state.contains<RegionKills>(R))
     return UnknownVal();
 
+  // If the region is an element of field, it may have a default value.
+  if (isa<ElementRegion>(R) || isa<FieldRegion>(R)) {
+    const MemRegion* SuperR = cast<SubRegion>(R)->getSuperRegion();
+    GRStateTrait<RegionDefaultValue>::lookup_type D = 
+      state.get<RegionDefaultValue>(SuperR);
+    if (D)
+      return *D;
+  }
+
   // The location does not have a bound value.  This means that it has
   // the value it had upon its creation and/or entry to the analyzed
   // function/method.  These are either symbolic values or 'undefined'.