mirror of
git://sourceware.org/git/libabigail.git
synced 2025-02-15 13:07:00 +00:00
48801d23e4
It turns out that, in DWARF, there can be function template
instantiations foo<int>(int) and foo<TypedefOfInt>(TypedefOfInt) which
have the same symbol name, if TypedefOfInt is a typedef of int.
An ABI corpus retains only one function declaration per symbol
name. So in the example of the bug the input DWARF has the two
instantiations, but libabigail is just keeping one of the two; so the
abixml only has one of the two template instantiations.
This patch changes the ABI corpus model so that it represents the fact
that there can be several function declarations for a given symbol.
The patch then adjust the comparison engine to make it know about this
new model.
* include/abg-corpus.h
(corpus::exported_decls_builder::str_{fn,var}_ptr_map_type):
Remove these typedefs from here as they only used internally in
abg-corpus.cc. So we move them there instead.
* src/abg-corpus.cc (str_fn_ptrs_map_type): New typedef.
(str_var_ptr_map_type): Moved the typedef that was in
corpus::exported_decls_builder here.
(corpus::exported_decls_builder::id_fns_map_): Rename the fns_
data member into this. Make it have a str_fn_ptrs_map_type as a
type.
(corpus::exported_decls_builder::id_fns_map): Renamed the
fns_map() accessor into this one.
(corpus::exported_decls_builder::{fn_id_is_in_id_fns_map,
fn_is_in_fns}): New member functions.
(corpus::exported_decls_builder::fn_is_in_id_fns_map): Rename
fn_is_in_map into this.
(corpus::exported_decls_builder::add_fn_to_id_fns_map): Rename
add_fn_to_map into this.
(corpus::exported_decls_builder::add_fn_to_exported): Adjust.
(corpus::exported_decls_builder::maybe_add_fn_to_exported_fns):
Adjust.
* src/abg-comparison.cc (function_decl_diff::report): Emit reports
about function name changes (for a given function ID) only if
there are sub-type changes to be reported for the function. In
that case, do not forget to emit the sub-type changes after the
name changes have been reported.
(corpus_diff::priv::ensure_lookup_tables_populated): Several
functions of the same ID can be removed or added from/to the
corpus.
* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so:
New test input binary.
* tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
New test output reference.
* tests/data/Makefile.am: Add the new test materials to the source
distribution.
* tests/test-read-dwarf.cc (in_out_specs): Adjust to add the new
test inputs above.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
|
||
|---|---|---|
| .. | ||
| test0 | ||
| test0.abi | ||
| test0.cc | ||
| test1 | ||
| test1.abi | ||
| test1.cc | ||
| test2-0.cc | ||
| test2-1.cc | ||
| test2.h | ||
| test2.so | ||
| test2.so.abi | ||
| test3.c | ||
| test3.so | ||
| test3.so.abi | ||
| test4.c | ||
| test4.so | ||
| test4.so.abi | ||
| test5.cc | ||
| test5.o | ||
| test5.o.abi | ||
| test6.cc | ||
| test6.so | ||
| test6.so.abi | ||
| test7.cc | ||
| test7.so | ||
| test7.so.abi | ||
| test8-qualified-this-pointer.cc | ||
| test8-qualified-this-pointer.so | ||
| test8-qualified-this-pointer.so.abi | ||
| test9-pr18818-clang.so | ||
| test9-pr18818-clang.so.abi | ||
| test10-pr18818-gcc.so | ||
| test10-pr18818-gcc.so.abi | ||
| test11-pr18828.so | ||
| test11-pr18828.so.abi | ||
| test12-pr18844.so | ||
| test12-pr18844.so.abi | ||
| test13-pr18894.so | ||
| test13-pr18894.so.abi | ||
| test14-pr18893.so | ||
| test14-pr18893.so.abi | ||
| test15-pr18892.so | ||
| test15-pr18892.so.abi | ||
| test16-pr18904.so | ||
| test16-pr18904.so.abi | ||
| test17-pr19027.so | ||
| test17-pr19027.so.abi | ||
| test18-pr19037-libvtkRenderingLIC-6.1.so | ||
| test18-pr19037-libvtkRenderingLIC-6.1.so.abi | ||