From 611d6948007ea29a3e009ed2d616c27eacb42677 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 23 Feb 2011 19:39:31 +0100
Subject: Revert "debugging hacks, not to be merged"

This reverts commit 1a148b60eb17f9f5d8b131dc9953b6665c2e748d.
---
 libdw/c++/dwarf_comparator | 4 ----
 libdw/c++/dwarf_output     | 8 +-------
 libdw/c++/dwarf_tracker    | 6 +++---
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/libdw/c++/dwarf_comparator b/libdw/c++/dwarf_comparator
index 98afafc4..af0964b9 100644
--- a/libdw/c++/dwarf_comparator
+++ b/libdw/c++/dwarf_comparator
@@ -304,10 +304,6 @@ namespace elfutils
 
       inline bool operator () (const ait1 &it1, const ait2 &it2)
       {
-	if (!_m_cmp.equals ((*it1).second, (*it2).second))
-	  {
-	    asm("nop");
-	  }
 	return _m_cmp.equals ((*it1).second, (*it2).second);
       }
     };
diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index 0ee62dae..119221c1 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -151,12 +151,6 @@ namespace elfutils
       friend class dwarf_output;
       friend class dwarf_output_collector;
 
-      __attribute__((used)) die_info_pair *info () const
-      {
-	return reinterpret_cast<die_info_pair *>
-	  (const_cast<debug_info_entry *> (this));
-      }
-
     public:
       class attributes_type
 	: public dwarf_data::attributes_type<dwarf_output, value>
@@ -1706,7 +1700,7 @@ namespace elfutils
 	/* XXX disabled! tentative circularity matches taint this record!
 	   must record taint to avoid caching, or punt caching.
 	 */
-	_m_pending->_m_matched = doppleganger;
+	//_m_pending->_m_matched = doppleganger;
       }
 
       /* This is called by finalize_children.  In case of imported_unit
diff --git a/libdw/c++/dwarf_tracker b/libdw/c++/dwarf_tracker
index cb147118..c75ccda2 100644
--- a/libdw/c++/dwarf_tracker
+++ b/libdw/c++/dwarf_tracker
@@ -706,15 +706,15 @@ namespace elfutils
       return matched._m_lhs == NULL && matched._m_rhs == NULL;
     }
 
-    inline bool notice_match (reference_match &matched,
-			      const die1 &, const die2 &b, bool matches)
+    inline bool notice_match (reference_match &/*matched*/,
+			      const die1 &, const die2 &/*b*/, bool matches)
     {
       /* XXX not reliable!
 	 This match could be predicated on a tentative match of a
 	 circular ref inside.  We can't cache that!
-      */
       if (matches && matched._m_lhs != NULL)
 	matched._m_lhs->second.insert (b);
+      */
       return matches;
     }
 
-- 
cgit v1.2.3