1 files changed, 4 insertions, 9 deletions
diff --git a/clang/include/clang/Analysis/Analyses/IntervalSolver/IdMap.hpp b/clang/include/clang/Analysis/Analyses/IntervalSolver/IdMap.hpp
index 5e3aa3b..8cb25f8 100644
--- a/clang/include/clang/Analysis/Analyses/IntervalSolver/IdMap.hpp
+++ b/clang/include/clang/Analysis/Analyses/IntervalSolver/IdMap.hpp
@@ -1,13 +1,14 @@
 #ifndef ID_MAP_HPP
 #define ID_MAP_HPP
 
+#include <cassert>
 #include <ostream>
 
 template<typename T, typename V>
 struct IdMap {
   IdMap(unsigned int length, V initial)
     : _length(length), _assignment(new V[length]) {
-    for (unsigned int i = 0; i < length; ++i) {
+    for (unsigned int i = 0; i < _length; ++i) {
       _assignment[i] = initial;
     }
   }
@@ -32,17 +33,11 @@ struct IdMap {
     return *this;
   }
   virtual const V& operator[] (const T& x) const {
-    if (x.id() >= _length) {
-      std::cout << "throw exception" << *(char*)NULL;
-      //throw "Array out of bounds";
-    }
+    assert(x.id() < _length);
     return _assignment[x.id()];
   }
   virtual V& operator[] (const T& x) {
-    if (x.id() >= _length) {
-      std::cout << "throw exception" << *(char*)NULL;
-      //throw "Array out of bounds";
-    }
+    assert(x.id() < _length);
     return _assignment[x.id()];
   }