Revert "debugging hacks, not to be merged"

This reverts commit 1a148b60eb17f9f5d8b131dc9953b6665c2e748d.

diff --git a/libdw/c++/dwarf_comparator b/libdw/c++/dwarf_comparator
index 98afafc4b92242371838094f03e153d1f9c76005..af0964b9c136db5db379f655504dcbff1c6f7611 100644 (file)
--- 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 0ee62daeaa9dfabeab272a02b6ddd9ad4c40bd01..119221c124e8b40972dad16abaf18112f69ea8e1 100644 (file)
--- 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 cb14711853864e57a03cd12ea44b0cceb197d616..c75ccda2438ede43cab980e7c89537ca15b8f66b 100644 (file)
--- 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;
     }