From 07c1ec3fda0551b7f56e7640743b3c955af5b308 Mon Sep 17 00:00:00 2001
From: John Mellor-Crummey <johnmc@rice.edu>
Date: Sun, 19 Nov 2017 21:17:21 -0600
Subject: [PATCH] clean out dead code in CFGFactory

---
 parseAPI/h/CFGFactory.h   | 34 ----------------------------------
 parseAPI/src/CFGFactory.C |  7 -------
 2 files changed, 41 deletions(-)

diff --git a/parseAPI/h/CFGFactory.h b/parseAPI/h/CFGFactory.h
index 7aa7bfb3e2..5485f2289c 100644
--- a/parseAPI/h/CFGFactory.h
+++ b/parseAPI/h/CFGFactory.h
@@ -71,41 +71,8 @@ class flist_iter {
         return (cur_ != iter.cur_);
     }
 };
-#if 0
-template <class T>
-class fact_list {
- public:
-    typedef flist_iter<T> iterator;
-    typedef const flist_iter<T> const_iterator;
-    typedef T elem;
 
-    fact_list() {
-        head.alloc_set_next(&head);
-        head.alloc_set_prev(&head);
-    }
-
-    ~fact_list() { }
 
-    void add(elem & new_elem) {
-        head.append(new_elem);
-    }
-    void add_tail(elem & new_elem) {
-        head.prepend(new_elem);
-    }
-    void clear() {
-        while(head.alloc_next() != &head)
-            head.alloc_next()->remove();
-    }
-    
-    // iterators
-    iterator begin() { return iterator(head.alloc_next()); }
-    iterator end() { return iterator(&head); }
-    const_iterator begin() const { return iterator(head.alloc_next()); }
-    const_iterator end() const { return iterator(&head); }
- private:
-    allocatable head;
-};
-#else
 template <class T>
 class fact_list {
 public:
@@ -130,7 +97,6 @@ class fact_list {
   LockFreeQueue<T> queue;
 };
 
-#endif
 
 /** An implementation of CFGFactory is responsible for allocation and
     deallocation of CFG objects like Blocks, Edges, and Functions.
diff --git a/parseAPI/src/CFGFactory.C b/parseAPI/src/CFGFactory.C
index 06c1e433e7..974c4e7d1a 100644
--- a/parseAPI/src/CFGFactory.C
+++ b/parseAPI/src/CFGFactory.C
@@ -94,7 +94,6 @@ Function *
 CFGFactory::_mkfunc(Address addr, FuncSource src, string name, 
     CodeObject * obj, CodeRegion * reg, Dyninst::InstructionSource * isrc)
 {
-  // boost::lock_guard<CFGFactory> g(*this);
    Function * ret = mkfunc(addr,src,name,obj,reg,isrc);
    funcs_.add(ret);
    ret->_src =  src;
@@ -114,8 +113,6 @@ CFGFactory::mkfunc(Address addr, FuncSource, string name,
 Block *
 CFGFactory::_mkblock(Function *  f , CodeRegion *r, Address addr)
 {
-  // boost::lock_guard<CFGFactory> g(*this);
-
    Block * ret = mkblock(f, r, addr);
    blocks_.add(ret);
    return ret;
@@ -131,8 +128,6 @@ CFGFactory::mkblock(Function *  f , CodeRegion *r, Address addr) {
 
 Block *
 CFGFactory::_mksink(CodeObject * obj, CodeRegion *r) {
-  // boost::lock_guard<CFGFactory> g(*this);
-
    Block * ret = mksink(obj,r);
    blocks_.add(ret);
    return ret;
@@ -146,8 +141,6 @@ CFGFactory::mksink(CodeObject * obj, CodeRegion *r) {
 
 Edge *
 CFGFactory::_mkedge(Block * src, Block * trg, EdgeTypeEnum type) {
-  // boost::lock_guard<CFGFactory> g(*this);
-
     Edge * ret = mkedge(src,trg,type);
     edges_.add(ret);
     return ret;