2 files changed, 51 insertions, 0 deletions
diff --git a/lib/Analysis/SVals.cpp b/lib/Analysis/SVals.cpp
index 6b29ae7d42..644f60d25a 100644
--- a/lib/Analysis/SVals.cpp
+++ b/lib/Analysis/SVals.cpp
@@ -272,6 +272,22 @@ SVal SVal::GetSymbolValue(SymbolManager& SymMgr, VarDecl* D) {
   return nonloc::SymbolVal(SymMgr.getSymbol(D));
 }
 
+SVal SVal::getSymbolValue(SymbolManager& SymMgr, const MemRegion* R,
+                          const llvm::APSInt* Idx, QualType T) {
+  if (Loc::IsLocType(T))
+    return loc::SymbolVal(SymMgr.getElementSymbol(R, Idx));
+  else
+    return nonloc::SymbolVal(SymMgr.getElementSymbol(R, Idx));
+}
+
+SVal SVal::getSymbolValue(SymbolManager& SymMgr, const MemRegion* R,
+                          const FieldDecl* FD, QualType T) {
+  if (Loc::IsLocType(T))
+    return loc::SymbolVal(SymMgr.getFieldSymbol(R, FD));
+  else
+    return nonloc::SymbolVal(SymMgr.getFieldSymbol(R, FD));
+}
+
 nonloc::LocAsInteger nonloc::LocAsInteger::Make(BasicValueFactory& Vals, Loc V,
                                                 unsigned Bits) {
   return LocAsInteger(Vals.getPersistentSValWithData(V, Bits));
diff --git a/lib/Analysis/SymbolManager.cpp b/lib/Analysis/SymbolManager.cpp
index 7829e3ace3..aee74a4a14 100644
--- a/lib/Analysis/SymbolManager.cpp
+++ b/lib/Analysis/SymbolManager.cpp
@@ -51,6 +51,41 @@ SymbolID SymbolManager::getSymbol(VarDecl* D) {
   DataMap[SymbolCounter] = SD;
   return SymbolCounter++;
 }  
+
+SymbolID SymbolManager::getElementSymbol(const MemRegion* R, 
+                                         const llvm::APSInt* Idx){
+  llvm::FoldingSetNodeID ID;
+  SymbolDataElement::Profile(ID, R, Idx);
+  void* InsertPos;
+  SymbolData* SD = DataSet.FindNodeOrInsertPos(ID, InsertPos);
+
+  if (SD)
+    return SD->getSymbol();
+
+  SD = (SymbolData*) BPAlloc.Allocate<SymbolDataElement>();
+  new (SD) SymbolDataElement(SymbolCounter, R, Idx);
+
+  DataSet.InsertNode(SD, InsertPos);
+  DataMap[SymbolCounter] = SD;
+  return SymbolCounter++;
+}
+
+SymbolID SymbolManager::getFieldSymbol(const MemRegion* R, const FieldDecl* D) {
+  llvm::FoldingSetNodeID ID;
+  SymbolDataField::Profile(ID, R, D);
+  void* InsertPos;
+  SymbolData* SD = DataSet.FindNodeOrInsertPos(ID, InsertPos);
+
+  if (SD)
+    return SD->getSymbol();
+
+  SD = (SymbolData*) BPAlloc.Allocate<SymbolDataField>();
+  new (SD) SymbolDataField(SymbolCounter, R, D);
+
+  DataSet.InsertNode(SD, InsertPos);
+  DataMap[SymbolCounter] = SD;
+  return SymbolCounter++;
+}
  
 SymbolID SymbolManager::getContentsOfSymbol(SymbolID sym) {