Move Array construction out of MemoryObject into ObjectState.

git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@73162 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 11 deletions

diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp
index ba1b8e1f..513c2177 100644
--- a/lib/Core/Memory.cpp
+++ b/lib/Core/Memory.cpp
@@ -57,16 +57,6 @@ int MemoryObject::counter = 0;
 extern "C" void vc_DeleteExpr(void*);
 
 MemoryObject::~MemoryObject() {
-  // FIXME: This shouldn't be necessary. Array's should be ref-counted
-  // just like everything else, and the interaction with the STP array
-  // should hide at least inside the Expr/Solver layers.
-  if (array) {
-    if (array->stpInitialArray) {
-      ::vc_DeleteExpr(array->stpInitialArray);
-      array->stpInitialArray = 0;
-    }
-    delete array;
-  }
 }
 
 void MemoryObject::getAllocInfo(std::string &result) const {
@@ -102,7 +92,8 @@ ObjectState::ObjectState(const MemoryObject *mo, unsigned _size)
     flushMask(0),
     knownSymbolics(0),
     size(_size),
-    updates(mo->array, 0),
+    // FIXME: Leaked!
+    updates(new Array("arr" + llvm::utostr(mo->id), _size), 0),
     readOnly(false) {
 }