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

Fix anonymous union constructed under the wrong context

Browse Source 
This patch is second of the series:

    Internal pretty repr of union cannot be flat representation
    Fix anonymous union constructed under the wrong context
    Propagate private type diff category through refs/qualified type diffs

The intent of this series is to fix the bug:

    https://sourceware.org/bugzilla/show_bug.cgi?id=24410
    "Empty change report emitted for libpoppler-qt5.so.1.18.0"

What happens here is that when the DWARF reader sees an anonymous
union/struct, it can mistakenly think that it has seen it before
(because the comparison doesn't take the scope of the union/struct
into account), and thus mistakenly represent the union/struct.

The solution implemented by this patch is to take the scope of the
anonymous union/struct into account.

Note that regression tests are all updated in the last patch of the
series.

	* src/abg-dwarf-reader.cc (add_or_update_class_type)
	(add_or_update_union_type): Only reuse anonymous class/union types
	which have the same scope as the current one.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2019-04-05 11:42:38 +02:00
parent 522ac2595d
commit dc84fee0dc
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13495,6 +13495,9 @@ add_or_update_class_type(read_context& ctxt,
// re-use that one. // re-use that one.
if (class_decl_sptr pre_existing_class = if (class_decl_sptr pre_existing_class =
is_class_type(ctxt.lookup_type_artifact_from_die(die))) is_class_type(ctxt.lookup_type_artifact_from_die(die)))
// For an anonymous type, make sure the pre-existing one has the
// same scope as the current one.
if (!is_anonymous || pre_existing_class->get_scope() == scope)
klass = pre_existing_class; klass = pre_existing_class;
uint64_t size = 0; uint64_t size = 0;
@ -13803,6 +13806,9 @@ add_or_update_union_type(read_context& ctxt,
// 'die' then let's re-use that one. // 'die' then let's re-use that one.
if (union_decl_sptr pre_existing_union = if (union_decl_sptr pre_existing_union =
is_union_type(ctxt.lookup_artifact_from_die(die))) is_union_type(ctxt.lookup_artifact_from_die(die)))
// For an anonymous type, make sure the pre-existing one has the
// same scope as the current one.
if (!is_anonymous || pre_existing_union->get_scope() == scope)
union_type = pre_existing_union; union_type = pre_existing_union;
uint64_t size = 0; uint64_t size = 0;