RepoMirrors
/
libabigail
mirror of git://sourceware.org/git/libabigail.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ir: Fix getting the translation unit for an ABI artifact 

Sometimes when the current translation unit is not yet set for a given
artifact, we can infer it by getting the translation unit of the scope
of the artifact.  This patch performs that inference when the
translation unit is not yet set for the current artifact.

	* include/abg-fwd.h (get_translation_unit): Take a
	type_or_decl_base parameter, not a decl_base.
	* src/abg-ir.cc (get_translation_unit): Likewise.  If no
	translation has yet been associated with the ABI artifact, get it
	from its scope.
	(type_or_decl_base::get_corpus): Use the new get_translation_unit.
	(maybe_set_translation_unit): Assert that the translation unit is
	non-nil.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2024-08-01 13:22:34 +02:00
parent f68ae8cb36
commit 90dae34855
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/abg-fwd.h
View File

@ -359,13 +359,13 @@ const global_scope*
get_global_scope(const decl_base_sptr);
translation_unit*
get_translation_unit(const decl_base&);
get_translation_unit(const type_or_decl_base&);
translation_unit*
get_translation_unit(const decl_base*);
get_translation_unit(const type_or_decl_base*);
translation_unit*
get_translation_unit(const decl_base_sptr);
get_translation_unit(const type_or_decl_base_sptr&);
bool
is_global_scope(const scope_decl&);

34
src/abg-ir.cc
View File

@ -4220,7 +4220,7 @@ type_or_decl_base::has_artificial_location() const
corpus*
type_or_decl_base::get_corpus()
{
translation_unit* tu = get_translation_unit();
translation_unit* tu = abigail::ir::get_translation_unit(this);
if (!tu)
return 0;
return tu->get_corpus();
@ -7984,6 +7984,8 @@ static void
maybe_set_translation_unit(const decl_base_sptr& decl,
translation_unit* tu)
{
ABG_ASSERT(tu);
if (translation_unit* existing_tu = decl->get_translation_unit())
// The decl already belongs to a translation unit.
// Either:
@ -10167,8 +10169,28 @@ types_are_compatible(const decl_base_sptr d1,
/// @return the resulting translation unit, or null if the decl is not
/// yet added to a translation unit.
translation_unit*
get_translation_unit(const decl_base& decl)
{return const_cast<translation_unit*>(decl.get_translation_unit());}
get_translation_unit(const type_or_decl_base& t)
{
translation_unit* result =
const_cast<translation_unit*>(t.get_translation_unit());
if (result)
return result;
if (decl_base* decl = is_decl(&t))
{
scope_decl* scope = decl->get_scope();
while (scope)
{
result = scope->get_translation_unit();
if (result)
break;
scope = scope->get_scope();
}
}
return result;
}
/// Return the translation unit a declaration belongs to.
///
@ -10177,8 +10199,8 @@ get_translation_unit(const decl_base& decl)
/// @return the resulting translation unit, or null if the decl is not
/// yet added to a translation unit.
translation_unit*
get_translation_unit(const decl_base* decl)
{return decl ? get_translation_unit(*decl) : 0;}
get_translation_unit(const type_or_decl_base* decl)
{return decl ? get_translation_unit(*decl) : nullptr;}
/// Return the translation unit a declaration belongs to.
///
@ -10187,7 +10209,7 @@ get_translation_unit(const decl_base* decl)
/// @return the resulting translation unit, or null if the decl is not
/// yet added to a translation unit.
translation_unit*
get_translation_unit(const shared_ptr<decl_base> decl)
get_translation_unit(const type_or_decl_base_sptr& decl)
{return get_translation_unit(decl.get());}
/// Tests whether if a given scope is the global scope.