BUGFIX: Invalid use of iterators in ValueContainerV1 #7

VeriFIT · Mar 17, 2017 · 6d72a2b · michkot · Mar 17, 2017 · 6d72a2b
1 parent 2d52613
commit 6d72a2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/src/ValueContainerV1.cc b/src/ValueContainerV1.cc
@@ -28,7 +28,6 @@ along with Angie.  If not, see <http://www.gnu.org/licenses/>.
 #include <algorithm>
 #define CHECK_FLAG(var, flag) ((var & flag) == flag)
 
-
 //BinaryConstraint helper methods
 //--------------------------------------------------------------
 BinaryConstraint::BinaryConstraint(ValueId _first, ValueId _second, CmpFlags _relation)
@@ -135,10 +134,9 @@ void ValueContainer::InsertConstraint(BinaryConstraint constr)
         {
         case CmpFlags::Eq:
           //new constraint is equal to a constant -> delete all previous
-          //TODO@charvin FIX: invalidates iterator you are using!, 3x in this function
-          //HACK for now just do not delete, see TODO
-          // DeleteConstraint(oldConstraintId);
+          DeleteConstraint(oldConstraintId);
           break;
+
           //TODO::add cases for intervals
         default:
           break;
@@ -161,10 +159,9 @@ void ValueContainer::InsertConstraint(BinaryConstraint constr)
         {
         case CmpFlags::Eq:
           //new constraint is equal to a constant -> delete all previous
-          //TODO@charvin FIX: invalidates iterator you are using!, 3x in this function
-          //HACK for now just do not delete, see TODO
-          // DeleteConstraint(oldConstraintId);
+          DeleteConstraint(oldConstraintId);
           break;
+
           //TODO::add cases for intervals
         default:
           break;
@@ -182,9 +179,7 @@ void ValueContainer::InsertConstraint(BinaryConstraint constr)
     if (constr.second == constrContainer.at(oldConstraintId).GetOther(constr.first))
     {
       //delete mutual constraints
-      //TODO@charvin FIX: invalidates iterator you are using!, 3x in this function
-      //HACK for now just do not delete, see TODO
-      // DeleteConstraint(oldConstraintId);
+      DeleteConstraint(oldConstraintId);
     }
 
   }
@@ -217,14 +212,13 @@ void ValueContainer::DeleteConstraint(ConstraintId constrId)
   constrContainer.erase(constrId);
 }
 
-const std::vector<ConstraintId>& ValueContainer::GetConstraintIdVector(const ValueId id) const
+const std::vector<ConstraintId> ValueContainer::GetConstraintIdVector(const ValueId id) const
 {
-  static std::vector<ConstraintId> emptyvec;
   auto lhsConstrId = constrIdContainer.find(id);
 
   //is there a record of any constraints for the id
   if (lhsConstrId == constrIdContainer.end())
-    return emptyvec;
+    return std::vector<ConstraintId>();
 
   //return reference to the vector of constraintIds corresponding to the id
   return lhsConstrId->second;
@@ -560,7 +554,7 @@ ValueId ValueContainer::BinOp(ValueId first, ValueId second, Type type, BinaryOp
     //check for overflow
     if (CHECK_FLAG(options.flags, ArithFlags::NoUnsignedWrap))
     {
-      if (uMax - uValueLhs < uValueRhs)	//unsigned overflow
+      if (uMax - uValueLhs < uValueRhs) //unsigned overflow
         return CreateVal(type);
     }
     else if (CHECK_FLAG(options.flags, ArithFlags::NoSignedWrap))
@@ -578,7 +572,6 @@ ValueId ValueContainer::BinOp(ValueId first, ValueId second, Type type, BinaryOp
       }
     }
 
-
     uint64_t result = uValueLhs + uValueRhs;
     return CreateConstIntVal(result, type);
   }
@@ -760,6 +753,7 @@ ValueId ValueContainer::TruncateInt(ValueId first, Type sourceType, Type targetT
 
   else
     return first;
+
 }
 
 ValueId ValueContainer::CreateConstIntVal(uint64_t value)
@@ -804,4 +798,4 @@ void ValueContainer::PrintDebug() const
 
     cout << std::endl;
   }
-}
+}
diff --git a/src/ValueContainerV1.hh b/src/ValueContainerV1.hh
@@ -79,7 +79,7 @@ private:
 
   void InsertConstraint(BinaryConstraint);
   void DeleteConstraint(ConstraintId constrId);
-  const std::vector<ConstraintId> &GetConstraintIdVector(ValueId id) const;
+  const std::vector<ConstraintId> GetConstraintIdVector(ValueId id) const;
   bool IsConstant(ValueId first) const { auto res = constantContainer.find(first); return res != constantContainer.end(); }
   inline uint64_t RipBits(size_t numOfBits, uint64_t in) const;
   inline int64_t SignExtend64(size_t numOfBits, uint64_t in) const;
@@ -96,6 +96,7 @@ public:
   boost::tribool IsInternalRepEq(ValueId first, ValueId second) const override;
   boost::tribool IsZero(ValueId first) const override;
   bool           IsUnknown(ValueId first) const override;
+
 
   // Creates new boolean(1bit integer) value expressing the constraint
   ValueId Cmp(ValueId first, ValueId second, Type type, CmpFlags flags) override;