diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2014-10-11 13:04:27 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2014-10-11 13:04:27 -0400 |
| commit | 41c09b51a7000fe5eb6b702d4ef9a1644129410b (patch) | |
| tree | d2573cfef10bb7b34d0c6dcd63e3730719201856 /src/expr | |
| parent | 4e91f51cb0e58a9d2d8c1f12e387ca2455d307e4 (diff) | |
| parent | 0189f4b0e62edefa2b93f9bd4991a0c15c6cc3d5 (diff) | |
Merge branch '1.4.x'
Diffstat (limited to 'src/expr')
| -rw-r--r-- | src/expr/expr_manager_template.cpp | 4 | ||||
| -rw-r--r-- | src/expr/node_manager.cpp | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/expr/expr_manager_template.cpp b/src/expr/expr_manager_template.cpp index 7ce51ecdd..8bcfd58ba 100644 --- a/src/expr/expr_manager_template.cpp +++ b/src/expr/expr_manager_template.cpp @@ -105,18 +105,22 @@ ExprManager::~ExprManager() throw() { if (d_exprStatistics[i] != NULL) { d_nodeManager->getStatisticsRegistry()->unregisterStat_(d_exprStatistics[i]); delete d_exprStatistics[i]; + d_exprStatistics[i] = NULL; } } for (unsigned i = 0; i < LAST_TYPE; ++ i) { if (d_exprStatisticsVars[i] != NULL) { d_nodeManager->getStatisticsRegistry()->unregisterStat_(d_exprStatisticsVars[i]); delete d_exprStatisticsVars[i]; + d_exprStatisticsVars[i] = NULL; } } #endif delete d_nodeManager; + d_nodeManager = NULL; delete d_ctxt; + d_ctxt = NULL; } catch(Exception& e) { Warning() << "CVC4 threw an exception during cleanup." << std::endl diff --git a/src/expr/node_manager.cpp b/src/expr/node_manager.cpp index d0a477b9a..fb1284d0d 100644 --- a/src/expr/node_manager.cpp +++ b/src/expr/node_manager.cpp @@ -136,6 +136,8 @@ NodeManager::~NodeManager() { d_operators[i] = Node::null(); } + d_tupleAndRecordTypes.clear(); + Assert(!d_attrManager->inGarbageCollection() ); while(!d_zombies.empty()) { reclaimZombies(); @@ -157,9 +159,13 @@ NodeManager::~NodeManager() { Debug("gc:leaks") << ":end:" << endl; } + // defensive coding, in case destruction-order issues pop up (they often do) delete d_statisticsRegistry; + d_statisticsRegistry = NULL; delete d_attrManager; + d_attrManager = NULL; delete d_options; + d_options = NULL; } void NodeManager::reclaimZombies() { |