Merge branch 'dwarf' of ssh://git.fedorahosted.org/git/elfutils into dwarf

1 files changed, 5 insertions, 4 deletions

diff --git a/libdw/c++/dwarf_output b/libdw/c++/dwarf_output
index aeb192c4..aab1598b 100644
--- a/libdw/c++/dwarf_output
+++ b/libdw/c++/dwarf_output
@@ -1402,10 +1402,11 @@ namespace elfutils
 	      = dynamic_cast<const entry *> (it->second._m_value);
 	    if (ref != NULL)
 	      {
-		// Workaround weird case (bug?)
-		// https://fedorahosted.org/pipermail/elfutils-devel/2011-February/001792.html
-		if (it->first == DW_AT_containing_type
-		    && ref->_m_pending == this)
+		// Workaround weird cases of self-referential DIE.
+		// This really is a bug in the producer and dwarflint
+		// should warn about it. But it is easy to work around
+		// so just do it for now, by ignoring such values.
+		if (ref->_m_pending == this)
 		  continue;
 		else
 		  attr_rhashes ^= ref->get_reference_hash (stack);