RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2025-01-01 23:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear per-TU data before reading debub info for a TU

Browse Source 
A corpus is made of several translation units; when reading the
corpus, there is data (maintained in the reading context) that is
relevant to all the translation units.  But there is also data that is
relevant to the current translation unit being read only; and data
should cleared before starting to read the next translation unit.
Otherwise, bad and subtle issues happen.  This patch clears some
per-TU data that I forgot to clear recently.

The patch also does some code factorizing to increase maintainability.

	* src/abg-dwarf-reader.cc
	(read_context::die_type_map): New accessor for the two DIE->Type
	maps we have; the one of the main debug info section and the one
	of the alternate debug info section.
	(read_context::{associate_die_to_type,
	lookup_type_from_die_offset}): use the new die_type_map()
	accessor.
	(read_context::clear_per_translation_unit_data): Factorize this
	from build_translation_unit_and_add_to_ir().  Also, add code to
	clear the DIE->type map as well as the vectors of offsets of the
	types of the DIEs to canonicalize after the translation unit has
	been read.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2015-02-20 12:01:22 +01:00
parent dbe88f1103
commit 668116ed16
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/abg-dwarf-reader.cc
View File

@ -1770,6 +1770,24 @@ public:
verneed_section_()
{}
/// Clear the data that is relevant only for the current translation
/// unit being read. The rest of the data is relevant for the
/// entire ABI corpus.
void
clear_per_translation_unit_data()
{
die_decl_map().clear();
alternate_die_decl_map().clear();
die_type_map(/*in_alt_di=*/true).clear();
die_type_map(/*in_alt_di=*/false).clear();
types_to_canonicalize(/*in_alt_di=*/true).clear();
types_to_canonicalize(/*in_alt_di=*/false).clear();
while (!scope_stack().empty())
scope_stack().pop();
var_decls_to_re_add_to_tree().clear();
type_decl::get_void_type_decl()->set_scope(0);
}
unsigned short
dwarf_version() const
{return dwarf_version_;}
@ -2057,6 +2075,19 @@ public:
: lookup_decl_from_die_offset_primary(die_offset);
}
/// Return the the map that associates DIEs to the type they represent.
///
/// @param in_alt_die true iff the DIE is in the alternate debug info section.
///
/// @return return the map that associated DIEs to the type they represent.
die_type_map_type&
die_type_map(bool in_alt_die)
{
if (in_alt_die)
return alternate_die_type_map_;
return die_type_map_;
}
/// Associated a DIE (representing a type) at a given offset to the
/// type that it represents.
///
@ -2074,10 +2105,8 @@ public:
if (!type)
return;
if (in_alt_di)
alternate_die_type_map_[die_offset] = type;
else
die_type_map_[die_offset] = type;
die_type_map_type& m = die_type_map(in_alt_di);
m[die_offset] = type;
}
/// Lookup the type associated to a given DIE.
@ -2097,24 +2126,12 @@ public:
lookup_type_from_die_offset(size_t die_offset,
bool in_alt_die)
{
die_type_map_type::iterator i;
type_base_sptr result;
die_type_map_type& m = die_type_map(in_alt_die);
die_type_map_type::iterator i = m.find(die_offset);
if (in_alt_die)
{
i = alternate_die_type_map_.find(die_offset);
if (i == alternate_die_type_map_.end())
return type_base_sptr();
result = i->second;
}
else
{
i = die_type_map_.find(die_offset);
if (i == die_type_map_.end())
return type_base_sptr();
result = i->second;
}
if (i != m.end())
result = i->second;
return result;
}
@ -5573,12 +5590,7 @@ build_translation_unit_and_add_to_ir(read_context& ctxt,
// Clear the part of the context that is dependent on the translation
// unit we are reading.
ctxt.die_decl_map().clear();
ctxt.alternate_die_decl_map().clear();
while (!ctxt.scope_stack().empty())
ctxt.scope_stack().pop();
ctxt.var_decls_to_re_add_to_tree().clear();
type_decl::get_void_type_decl()->set_scope(0);
ctxt.clear_per_translation_unit_data();
ctxt.cur_tu_die(die);