diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-06-06 21:37:23 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-06-06 21:37:23 +0000 |
| commit | e64686fed86068e977ac84c5776438935f446f00 (patch) | |
| tree | 455592297e26e3ac84a8027db0e70e74dc3ecdc7 /src/expr/node_manager.h | |
| parent | daa163e694d257ffe8ba7ae8ccb240bcbfb1c276 (diff) | |
Fix for Mac OS breakage (x86 didn't crash, but probably would, eventually, on some problems---valgrind gave many complaints): the problem was that calloc() (in the Backtracker) wasn't allocating enough space for the type located at the resulting address. Resolves bug #263.
Also, some debugging improvements.
Diffstat (limited to 'src/expr/node_manager.h')
| -rw-r--r-- | src/expr/node_manager.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 9974df6ca..54266db13 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -185,10 +185,13 @@ class NodeManager { // if d_reclaiming is set, make sure we don't call // reclaimZombies(), because it's already running. - Debug("gc") << "zombifying node value " << nv - << " [" << nv->d_id << "]: " << *nv - << (d_inReclaimZombies ? " [CURRENTLY-RECLAIMING]" : "") - << std::endl; + if(Debug.isOn("gc")) { + Debug("gc") << "zombifying node value " << nv + << " [" << nv->d_id << "]: "; + nv->printAst(Debug("gc")); + Debug("gc") << (d_inReclaimZombies ? " [CURRENTLY-RECLAIMING]" : "") + << std::endl; + } d_zombies.insert(nv);// FIXME multithreading if(!d_inReclaimZombies) {// FIXME multithreading @@ -1269,8 +1272,12 @@ NodeClass NodeManager::mkConstInternal(const T& val) { new (&nv->d_children) T(val); poolInsert(nv); - Debug("gc") << "creating node value " << nv - << " [" << nv->d_id << "]: " << *nv << "\n"; + if(Debug.isOn("gc")) { + Debug("gc") << "creating node value " << nv + << " [" << nv->d_id << "]: "; + nv->printAst(Debug("gc")); + Debug("gc") << std::endl; + } return NodeClass(nv); } |