[PATCH] When allocating an overlapping memory object, klee_error instead of asserting. This unbreaks the test suite on LLVM 2.9+

[Peter Collingbourne]

---
 lib/Core/MemoryManager.cpp |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Core/MemoryManager.cpp b/lib/Core/MemoryManager.cpp
index 69bbd6e..532ae23 100644
--- a/lib/Core/MemoryManager.cpp
+++ b/lib/Core/MemoryManager.cpp
@@ -51,14 +51,12 @@ MemoryObject *MemoryManager::allocate(uint64_t size, bool 
isLocal,
 
 MemoryObject *MemoryManager::allocateFixed(uint64_t address, uint64_t size,
                                            const llvm::Value *allocSite) {
-#ifndef NDEBUG
   for (objects_ty::iterator it = objects.begin(), ie = objects.end();
        it != ie; ++it) {
     MemoryObject *mo = *it;
-    assert(!(address+size > mo->address && address < mo->address+mo->size) &&
-           "allocated an overlapping object");
+    if (address+size > mo->address && address < mo->address+mo->size)
+      klee_error("allocated an overlapping object");
   }
-#endif
 
   ++stats::allocations;
   MemoryObject *res = new MemoryObject(address, size, false, true, true,
-- 
1.7.1


--BOKacYhQ+x31HxR3--