mirror of
git://sourceware.org/git/libabigail.git
synced 2025-02-08 01:31:37 +00:00
59610d5572
When building a union type we try to ensure that each member is
present only once. This is because the code to build the union is
also used to actually update a partially constructed union. To do so,
before adding a member to the union, the member is looked up (among
the current members) by name to see if it's already present or not.
But then for anonymous members, the name of the member is empty.
After the first anonymous member is added to the union, subsequent
look-ups with an empty name all succeed. So no more than one
anonymous member is added to the union. Oops.
A way to fix this is to perform the lookup by taking into account the
type of the anonymous data member, not its (empty) name. We already
do this for anonymous data members of classes/structs.
This patch thus uses that type-based anonymous data member lookup for
unions.
But then now that unions can have several anonymous members, another
issue was uncovered.
Array types whose elements are of anonymous type can be wrongly
considered different because of canonicalization issues.
Let's suppose we have these two arrays whose internal pretty
representation are:
"__anonymous_struct_1__ foo[5]"
and
"__anonymous_struct_2__ foo[5]"
These are arrays of 5 elements of type anonymous struct. Suppose the
anonymous structs "__anonymous_struct_1__" and
"__anonymous_struct_2__" are structurally equivalent. Because the
internal names of these array element types are different, the
internal pretty representations of the arrays are different. And thus
the canonical types of the two arrays are different. And that's
wrong. In this particular case, they should have the same canonical
type and thus be considered equivalent.
This patch thus teaches 'get_type_name' to make the internal type
name of anonymous types of a given kind be the same. Thus, making all
arrays of 5 anonymous struct have the same pretty representation:
"__anonymous_struct__ foo[5]"
This gives the type canonicalizer a chance to detect that those arrays
having the same canonical type.
These two changes while being seemingly unrelated need to be bundled
together to fix a number of issues in the existing test reference
outputs because fixing the first one is needed to uncover the later
issue.
* src/abg-dwarf-reader.cc (add_or_update_union_type): Don't use
the empty name of anonymous members in the lookup to ensure that
all data members are unique. Rather, use the whole anonymous
member itself for the lookup, just like is done to handle
anonymous data member in classes/structs.
* src/abg-reader.cc (build_union_decl): Likewise.
* src/abg-ir.cc (get_generic_anonymous_internal_type_name): Define
new static function.
(get_type_name): For internal purposes, make the type name of all
anonymous types of a given kind to be the same. This allows the
internal representation of anonymous types which are based on type
names to all be the same, so that they can be compared among
themselves during type canonicalization.
* tests/data/test-read-dwarf/test-PR26568-{1,2}.c: Source code of
binary test input.
* tests/data/test-read-dwarf/test-PR26568-{1,2}.o: New binary test input.
* tests/data/test-read-dwarf/test-PR26568-{1,2}.o.abi: New
reference test ouput.
* tests/data/Makefile.am: Add the new test material above to
source distribution.
* tests/test-read-dwarf.cc (in_out_specs): Add the new binary test
input above to this test harness.
* tests/data/test-diff-dwarf-abixml/PR25409-librte_bus_dpaa.so.20.0.abi: Adjust.
* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
|
||
|---|---|---|
| .. | ||
| data | ||
| lib | ||
| .gitignore | ||
| Makefile.am | ||
| mockfedabipkgdiff.in | ||
| print-diff-tree.cc | ||
| runtestcanonicalizetypes.sh.in | ||
| runtestdefaultsupprs.py.in | ||
| runtestdefaultsupprspy3.sh.in | ||
| runtestfedabipkgdiff.py.in | ||
| runtestfedabipkgdiffpy3.sh.in | ||
| test-abicompat.cc | ||
| test-abidiff-exit.cc | ||
| test-abidiff.cc | ||
| test-alt-dwarf-file.cc | ||
| test-annotate.cc | ||
| test-core-diff.cc | ||
| test-cxx-compat.cc | ||
| test-diff2.cc | ||
| test-diff-dwarf-abixml.cc | ||
| test-diff-dwarf.cc | ||
| test-diff-filter.cc | ||
| test-diff-pkg.cc | ||
| test-diff-suppr.cc | ||
| test-dot.cc | ||
| test-elf-helpers.cc | ||
| test-ini.cc | ||
| test-ir-walker.cc | ||
| test-kmi-whitelist.cc | ||
| test-lookup-syms.cc | ||
| test-read-dwarf.cc | ||
| test-read-write.cc | ||
| test-svg.cc | ||
| test-symtab.cc | ||
| test-tools-utils.cc | ||
| test-types-stability.cc | ||
| test-utils.cc | ||
| test-utils.h | ||
| test-valgrind-suppressions.supp | ||
| test-write-read-archive.cc | ||
| update-test-output.py | ||