mirror of
git://sourceware.org/git/libabigail.git
synced 2025-03-03 13:17:35 +00:00
217ba7fdb8
Sometimes, anonymous member types are duplicated in some classes read
by the DWARF reader. This is because the DWARF reader doesn't lookup
anonymous member types in their class scope before adding them into
their scope.
This patch teaches the DWARF reader how to name an anonymous class,
union or enum by using its flat pretty representation, e.g:
struct {int blah; char meh;}
That flat representation is used as the name of the anonymous type to
look it up in a given class scope before adding it to that scope. If
the scope already contains the type, then the type is not added.
Now that class scopes have their proper anonymous member types, it
appeared that the filtering of change reports needed a number of
adaptations because we are now seeing things that we were not seeing
before. For instance two new change categories
NON_COMPATIBLE_DISTINCT_CHANGE_CATEGORY and
NON_COMPATIBLE_NAME_CHANGE_CATEGORY are added. The former is for a
change where a given type becomes another type of a different kind in
an non-compatible way. For instance, a struct type becomes an enum
type. The later category is for a change in a name of the type,
resulting in a non-compatible change. Thus, new non-compatible
changes can now be categorized and reported as such.
* include/abg-comp-filter.h (has_void_ptr_to_ptr_change)
(has_harmless_enum_to_int_change)
(has_benign_array_of_unknown_size_change): Declare new functions.
* include/abg-comparison.h (enum diff_category): Add
NON_COMPATIBLE_DISTINCT_CHANGE_CATEGORY,
NON_COMPATIBLE_NAME_CHANGE_CATEGORY enumerators. Update the other
enumerator values. Also, update the EVERYTHING_CATEGORY
enumerator value.
* include/abg-ir.h (class_decl::find_base_class): Document the
name of the parameter.
* src/abg-comp-filter.cc (type_diff_has_cv_qual_change_only)
(is_non_compatible_distinct_change, is_void_ptr_to_ptr): Define
new static functions.
(has_subtype_changes): Remove static function.
(class_diff_has_only_harmless_changes): Do not bother checking if
the class_diff has subtype changes. If there are, the category of
those changes is going to be propagated upward to this current
diff node. Update the comments.
(has_harmless_name_change): A diff node carrying compatible types
or types that differ only from their CV qualifiers should qualify
as having a harmless name change.
(has_harmless_enum_to_int_change): Make this function be
non-static.
(type_diff_has_cv_qual_change_only): Introduce an overload that
takes two ABI artifacts instead of one diff node. Make the diff
node overload use the new one. Simplify logic by essentially
peeling off qualified or typedefs first. Then if what remain is
pointer or array types, look at their underlying types. If the
remaining underlying types are equal then return true.
(has_void_ptr_to_ptr_change): Use the new is_void_ptr_to_ptr
function. This allows the function to detect void* -> pointer and
pointer -> void* changes. And it simplifies the logic.
* src/abg-comparison.cc (distinct_diff::compatible_child_diff):
Build a compatible child diff node iff the two diff subject are
actually compatible meaning, they are equal modulo a typedef.
(get_default_harmful_categories_bitmap): Add the new
abigail::comparison::{NON_COMPATIBLE_DISTINCT_CHANGE_CATEGORY,NON_COMPATIBLE_NAME_CHANGE_CATEGORY}
enumerators to the bitmap of harmful categories.
(operator<<(ostream& o, diff_category c)): Update this to support
emitting the new
abigail::comparison::{NON_COMPATIBLE_DISTINCT_CHANGE_CATEGORY,NON_COMPATIBLE_NAME_CHANGE_CATEGORY}
enumerators.
(class_or_union_diff::priv::count_filtered_{subtype_}changed_dm):
Fix logic for counting local changes.
diff::has_local_changes_to_be_reported is not reliable so do not
rely on it. We might want to remove that function in the end.
(category_propagation_visitor::visit_end): If the current diff
node has a harmless void pointer to pointer, enum to int, or a
benign array of unknown size change, do not propagate the
NON_COMPATIBLE_{NAME,DISTINCT}_CHANGE_CATEGORY that have
necessarily bubbled up from some of their distant children nodes.
* src/abg-dwarf-reader.cc
(maybe_set_member_type_access_specifier)
(get_next_member_sibling_die): Declare this pre-existing static
function.
(get_internal_anonymous_die_name)
(lookup_class_typedef_or_enum_type_from_corpus)
(lookup_class_typedef_or_enum_type_from_corpus): Remove.
(die_return_and_parm_names_from_fn_type_die): Add is_method_type
and return_type_name parameters. Fix the representation of member
functions.
(die_function_signature): Add qualified_name parameter. Adjust
call to die_return_and_parm_names_from_fn_type_die.
(die_type_name, die_enum_flat_representation)
(die_class_flat_representation)
(die_class_or_enum_flat_representation): Define new static
functions.
(reader::get_die_qualified_type_name, die_qualified_type_name):
For anonymous class or enum types, use the new
die_class_or_enum_flat_representation. Adjust the call to
die_return_and_parm_names_from_fn_type_die. For function types fix
the name representation.
(die_pretty_print_type): Adjust call to
die_return_and_parm_names_from_fn_type_die.
(die_pretty_print_decl): Take qualified_name and include_fns
parameters. Use the new die_type_name for variable type names.
Adjust call to die_function_signature.
(die_pretty_print): Adjust call die_pretty_print_decl.
(get_member_child_die): Remove useless vertical space.
(build_enum_underlying_type): Sort this enum underlying type (and
potentially hash it) before canonicalizing it.
(add_or_update_class_type): If an anonymous type is in the global
scope, take that into account when building its internal anonymous
die name. Lookup anonymous member types before adding them to the
class scope to avoid duplicating them in their scope.
(add_or_update_union_type): Likewise, lookup anonymous member
types before adding them to the union scope to avoid duplicating
them in their scope.
(build_subranges_from_array_type_die): Const-ify the input reader.
Adjust call to build_ir_node_from_die. Associate the subrange DIE
to the IR node built.
(build_ir_node_from_die): Get the current corpus from the reader
because it might be set for scope passed to this function, or the
scope might be nullptr. Schedule base types for canonicalization
like all the other types. Also, lookup all class/union types
before adding them to their class scope.
* src/abg-leaf-reporter.cc (leaf_reporter::report): In the
overload for class_or_union_diff, report changed data members and
their sub-types.
* tests/Makefile.am: Do not XFAIL the test runtestabidiffexit. No
more tests are XFAILED. All tests should now pass.
* tests/data/test-abidiff-exit/PR30503/libsdl/libsdl-1.2.60-1.2.64-report.txt:
Adjust.
* tests/data/test-abidiff-exit/PR31513/reported/PR31513-reported-report-1.txt:
Likewise.
* tests/data/test-abidiff-exit/qualifier-typedef-array-report-1.txt:
Likewise.
* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Likewise.
* tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise.
* tests/data/test-annotate/test0.abi: Likewise.
* tests/data/test-annotate/test1.abi: Likewise.
* tests/data/test-annotate/test15-pr18892.so.abi: Likewise.
* tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
Likewise.
* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
Likewise.
* tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi:
Likewise.
* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
* tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt:
Likewise.
* tests/data/test-diff-dwarf/test4-report.txt: Likewise.
* tests/data/test-diff-dwarf/test5-report.txt: Likewise.
* tests/data/test-diff-filter/test-PR26739-2-report-0.txt:
Likewise.
* tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt:
Likewise.
* tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt:
Likewise.
* tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt:
Likewise.
* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt:
Likewise.
* tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt:
Likewise.
* tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt:
Likewise.
* tests/data/test-diff-filter/test41-report-0.txt: Likewise.
* tests/data/test-diff-filter/test5-report.txt: Likewise.
* tests/data/test-diff-pkg/libICE-1.0.6-1.el6.x86_64.rpm--libICE-1.0.9-2.el7.x86_64.rpm-report-0.txt:
Likewise.
* tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt:
Likewise.
* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt:
Likewise.
* tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt:
Likewise.
* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
Likewise.
* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
* tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi:
Likewise.
* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise.
* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi:
Likewise.
* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise.
* tests/data/test-read-dwarf/test-libaaudio.so.abi: Likewise.
* tests/data/test-read-dwarf/test-libandroid.so.abi: Likewise.
* tests/data/test-read-dwarf/test0.abi: Likewise.
* tests/data/test-read-dwarf/test0.hash.abi: Likewise.
* tests/data/test-read-dwarf/test1.abi: Likewise.
* tests/data/test-read-dwarf/test1.hash.abi: Likewise.
* tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi: Likewise.
* tests/data/test-read-dwarf/test11-pr18828.so.abi: Likewise.
* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
* tests/data/test-read-dwarf/test16-pr18904.so.abi: Likewise.
* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
Likewise.
* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
Likewise.
* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi:
Likewise.
* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
Likewise.
* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
|
||
|---|---|---|
| .. | ||
| libtest9-v0.so | ||
| libtest9-v1.so | ||
| libtest12-v0.so | ||
| libtest12-v1.so | ||
| libtest18-alias-sym-v0.so | ||
| libtest18-alias-sym-v1.so | ||
| libtest19-soname-v0.so | ||
| libtest19-soname-v1.so | ||
| libtest20-add-fn-parm-v0.so | ||
| libtest20-add-fn-parm-v1.so | ||
| libtest21-redundant-fn-v0.so | ||
| libtest21-redundant-fn-v1.so | ||
| libtest22-changed-parm-c-v0.so | ||
| libtest22-changed-parm-c-v1.so | ||
| libtest24-added-fn-parms-v0.so | ||
| libtest24-added-fn-parms-v1.so | ||
| libtest25-removed-fn-parms-v0.so | ||
| libtest25-removed-fn-parms-v1.so | ||
| libtest26-added-parms-before-variadic-v0.so | ||
| libtest26-added-parms-before-variadic-v1.so | ||
| libtest36-ppc64-aliases-v0.so | ||
| libtest36-ppc64-aliases-v1.so | ||
| libtest37-union-v0.so | ||
| libtest37-union-v1.so | ||
| libtest38-union-v0.so | ||
| libtest38-union-v1.so | ||
| libtest39-union-v0.so | ||
| libtest39-union-v1.so | ||
| libtest40-v0.so | ||
| libtest40-v1.so | ||
| libtest41-PR20476-hidden-new.so | ||
| libtest41-PR20476-hidden-old.so | ||
| libtest43-PR22913-v0.so | ||
| libtest43-PR22913-v1.so | ||
| libtest-23-diff-arch-v0-32.so | ||
| libtest-23-diff-arch-v0-64.so | ||
| PR25058-liblttng-ctl2.10.so | ||
| PR25058-liblttng-ctl-report-1.txt | ||
| PR25058-liblttng-ctl.so | ||
| test0-report.txt | ||
| test0-v0.cc | ||
| test0-v0.o | ||
| test0-v1.cc | ||
| test0-v1.o | ||
| test1-report.txt | ||
| test1-v0.cc | ||
| test1-v0.o | ||
| test1-v1.cc | ||
| test1-v1.o | ||
| test2-report.txt | ||
| test2-v0.cc | ||
| test2-v0.o | ||
| test2-v1.cc | ||
| test2-v1.o | ||
| test3-report.txt | ||
| test3-v0.cc | ||
| test3-v0.o | ||
| test3-v1.cc | ||
| test3-v1.o | ||
| test4-report.txt | ||
| test4-v0.cc | ||
| test4-v0.o | ||
| test4-v1.cc | ||
| test4-v1.o | ||
| test5-report.txt | ||
| test5-v0.cc | ||
| test5-v0.o | ||
| test5-v1.cc | ||
| test5-v1.o | ||
| test6-report.txt | ||
| test6-v0.cc | ||
| test6-v0.o | ||
| test6-v1.cc | ||
| test6-v1.o | ||
| test7-report.txt | ||
| test7-v0.cc | ||
| test7-v0.o | ||
| test7-v1.cc | ||
| test7-v1.o | ||
| test8-report.txt | ||
| test8-v0.cc | ||
| test8-v0.o | ||
| test8-v1.cc | ||
| test8-v1.o | ||
| test9-report.txt | ||
| test9-v0.cc | ||
| test9-v1.cc | ||
| test10-report.txt | ||
| test10-v0.cc | ||
| test10-v0.o | ||
| test10-v1.cc | ||
| test10-v1.o | ||
| test11-report.txt | ||
| test11-v0.cc | ||
| test11-v0.o | ||
| test11-v1.cc | ||
| test11-v1.o | ||
| test12-report.txt | ||
| test12-v0.c | ||
| test12-v1.c | ||
| test12-version-script | ||
| test13-report.txt | ||
| test13-v0.cc | ||
| test13-v0.o | ||
| test13-v1.cc | ||
| test13-v1.o | ||
| test14-inline-report.txt | ||
| test14-inline-v0.cc | ||
| test14-inline-v0.o | ||
| test14-inline-v1.cc | ||
| test14-inline-v1.o | ||
| test15-enum-report.txt | ||
| test15-enum-v0.cc | ||
| test15-enum-v0.o | ||
| test15-enum-v1.cc | ||
| test15-enum-v1.o | ||
| test16-syms-only-report.txt | ||
| test16-syms-only-v0.cc | ||
| test16-syms-only-v0.o | ||
| test16-syms-only-v1.cc | ||
| test16-syms-only-v1.o | ||
| test17-non-refed-syms-report-0.txt | ||
| test17-non-refed-syms-v0.cc | ||
| test17-non-refed-syms-v0.o | ||
| test17-non-refed-syms-v1.cc | ||
| test17-non-refed-syms-v1.o | ||
| test18-alias-sym-report-0.txt | ||
| test18-alias-sym-v0.cc | ||
| test18-alias-sym-v1.cc | ||
| test18-alias-sym-version-script | ||
| test19-soname-report-0.txt | ||
| test19-soname-v0.cc | ||
| test19-soname-v1.cc | ||
| test20-add-fn-parm-report-0.txt | ||
| test20-add-fn-parm-v0.c | ||
| test20-add-fn-parm-v1.c | ||
| test21-redundant-fn-report-0.txt | ||
| test21-redundant-fn-v0.cc | ||
| test21-redundant-fn-v1.cc | ||
| test22-changed-parm-c-report-0.txt | ||
| test22-changed-parm-c-v0.c | ||
| test22-changed-parm-c-v1.c | ||
| test24-added-fn-parms-report-0.txt | ||
| test24-added-fn-parms-v0.c | ||
| test24-added-fn-parms-v1.c | ||
| test25-removed-fn-parms-report-0.txt | ||
| test25-removed-fn-parms-v0.c | ||
| test25-removed-fn-parms-v1.c | ||
| test26-added-parms-before-variadic-report.txt | ||
| test26-added-parms-before-variadic-v0.c | ||
| test26-added-parms-before-variadic-v1.c | ||
| test27-local-base-diff-report.txt | ||
| test27-local-base-diff-v0.cc | ||
| test27-local-base-diff-v0.o | ||
| test27-local-base-diff-v1.cc | ||
| test27-local-base-diff-v1.o | ||
| test28-vtable-changes-report-0.txt | ||
| test28-vtable-changes-v0.cc | ||
| test28-vtable-changes-v0.o | ||
| test28-vtable-changes-v1.cc | ||
| test28-vtable-changes-v1.o | ||
| test29-vtable-changes-report-0.txt | ||
| test29-vtable-changes-v0.cc | ||
| test29-vtable-changes-v0.o | ||
| test29-vtable-changes-v1.cc | ||
| test29-vtable-changes-v1.o | ||
| test30-vtable-changes-report-0.txt | ||
| test30-vtable-changes-v0.cc | ||
| test30-vtable-changes-v0.o | ||
| test30-vtable-changes-v1.cc | ||
| test30-vtable-changes-v1.o | ||
| test31-vtable-changes-report-0.txt | ||
| test31-vtable-changes-v0.cc | ||
| test31-vtable-changes-v0.o | ||
| test31-vtable-changes-v1.cc | ||
| test31-vtable-changes-v1.o | ||
| test32-fnptr-changes-report-0.txt | ||
| test32-fnptr-changes-v0.cc | ||
| test32-fnptr-changes-v0.o | ||
| test32-fnptr-changes-v1.cc | ||
| test32-fnptr-changes-v1.o | ||
| test33-fnref-changes-report-0.txt | ||
| test33-fnref-changes-v0.cc | ||
| test33-fnref-changes-v0.o | ||
| test33-fnref-changes-v1.cc | ||
| test33-fnref-changes-v1.o | ||
| test34-pr19173-libfoo2.so | ||
| test34-pr19173-libfoo-report-0.txt | ||
| test34-pr19173-libfoo.so | ||
| test35-pr19173-libfoo-long-clang2.so | ||
| test35-pr19173-libfoo-long-clang-report-0.txt | ||
| test35-pr19173-libfoo-long-clang.so | ||
| test35-pr19173-libfoo-long-gcc2.so | ||
| test35-pr19173-libfoo-long-gcc-report-0.txt | ||
| test35-pr19173-libfoo-long-gcc.so | ||
| test35-pr19173-libfoo-long.c | ||
| test36-ppc64-aliases-report-0.txt | ||
| test36-ppc64-aliases-v0.cc | ||
| test36-ppc64-aliases-v1.cc | ||
| test37-union-report-0.txt | ||
| test37-union-v0.cc | ||
| test37-union-v1.cc | ||
| test38-union-report-0.txt | ||
| test38-union-v0.cc | ||
| test38-union-v1.cc | ||
| test39-union-report-0.txt | ||
| test39-union-v0.cc | ||
| test39-union-v1.cc | ||
| test40-report-0.txt | ||
| test40-v0.c | ||
| test40-v1.c | ||
| test41-PR20476-hidden-report-0.txt | ||
| test42-PR21296-clanggcc-report0.txt | ||
| test42-PR21296-clanggcc.cc | ||
| test42-PR21296-libclang.so | ||
| test42-PR21296-libgcc.so | ||
| test43-PR22913-report-0.txt | ||
| test43-PR22913-v0.c | ||
| test43-PR22913-v1.c | ||
| test44-anon-struct-union-report-0.txt | ||
| test44-anon-struct-union-v0.cc | ||
| test44-anon-struct-union-v0.o | ||
| test44-anon-struct-union-v1.cc | ||
| test44-anon-struct-union-v1.o | ||
| test45-anon-dm-change-report-0.txt | ||
| test45-anon-dm-change-v0.cc | ||
| test45-anon-dm-change-v0.o | ||
| test45-anon-dm-change-v1.cc | ||
| test45-anon-dm-change-v1.o | ||
| test46-readme.txt | ||
| test46-rust-libone.so | ||
| test46-rust-libtwo.so | ||
| test46-rust-report-0.txt | ||
| test-23-diff-arch-report-0.txt | ||
| test-23-diff-arch-v0.cc | ||