1 files changed, 29 insertions, 0 deletions
diff --git a/lib/Analysis/RegionStore.cpp b/lib/Analysis/RegionStore.cpp
index e6e530bc0f..7ab54b8b25 100644
--- a/lib/Analysis/RegionStore.cpp
+++ b/lib/Analysis/RegionStore.cpp
@@ -170,6 +170,8 @@ public:
   CastResult CastRegion(const GRState* state, const MemRegion* R,
                         QualType CastToTy);
 
+  SVal EvalBinOp(BinaryOperator::Opcode Op, Loc L, NonLoc R);
+
   /// The high level logic for this method is this:
   /// Retrieve (L)
   ///   if L has binding
@@ -551,6 +553,33 @@ RegionStoreManager::CastRegion(const GRState* state, const MemRegion* R,
   return CastResult(AddRegionView(state, ViewR, R), ViewR);
 }
 
+SVal RegionStoreManager::EvalBinOp(BinaryOperator::Opcode Op, Loc L, NonLoc R) {
+  // Assume the base location is MemRegionVal(ElementRegion).
+
+  if (!isa<loc::MemRegionVal>(L)) {
+    return UnknownVal();
+  }
+
+  const MemRegion* MR = cast<loc::MemRegionVal>(L).getRegion();
+
+  const ElementRegion* ER = cast<ElementRegion>(MR);
+  SVal Idx = ER->getIndex();
+
+  nonloc::ConcreteInt* Base = dyn_cast<nonloc::ConcreteInt>(&Idx);
+  nonloc::ConcreteInt* Offset = dyn_cast<nonloc::ConcreteInt>(&R);
+
+  // Only support concrete integer indexes for now.
+  if (Base && Offset) {
+    SVal NewIdx = Base->EvalBinOp(getBasicVals(), Op, *Offset);
+
+    const MemRegion* NewER = MRMgr.getElementRegion(NewIdx, 
+                                                    ER->getArrayRegion());
+    return Loc::MakeVal(NewER);
+
+  } else
+    return UnknownVal();
+}
+
 SVal RegionStoreManager::Retrieve(const GRState* St, Loc L, QualType T) {
   assert(!isa<UnknownVal>(L) && "location unknown");
   assert(!isa<UndefinedVal>(L) && "location undefined");