[PATCH, applied] Bug 29829 - dwarf-reader: Allow DIEs to be in a lexical block

[Dodji Seketeli <dodji@redhat.com>]

Hello,

Normally, ABI-relevant DWARF DIEs (types and decls) should be at
namespace level.  There are real-life cases where such a DIE might be
defined in a lexical block.

This patch teaches the DWARF reader to handle such cases.

	* src/abg-dwarf-reader.cc (get_scope_for_die): Support
	DW_TAG_lexical_block as DIE scope.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to the master branch.
---
 src/abg-dwarf-reader.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index e18f111b..68a4ca35 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -11632,7 +11632,8 @@ get_scope_for_die(reader& rdr,
   scope_decl_sptr s;
   type_or_decl_base_sptr d;
   if (dwarf_tag(&parent_die) == DW_TAG_subprogram
-      || dwarf_tag(&parent_die) == DW_TAG_array_type)
+      || dwarf_tag(&parent_die) == DW_TAG_array_type
+      || dwarf_tag(&parent_die) == DW_TAG_lexical_block)
     // this is an entity defined in a scope that is a function.
     // Normally, I would say that this should be dropped.  But I have
     // seen a case where a typedef DIE needed by a function parameter
-- 
2.31.1


-- 
		Dodji