mirror of
git://sourceware.org/git/libabigail.git
synced 2025-02-09 01:57:10 +00:00
3b6bada297
The series of fixes to make "abidw foo > foo.abi && abidiff foo foo.abi" work continues. On a binary submitted as part of bug 18904, I am still seeing type degradation. This patch addresses the different cases of degradation that are happening. * include/abg-fwd.h (get_type_scope): Declare new function. * src/abg-hash.cc (var_decl:#️⃣:operator()): Do not cache the hash because that can alter the hash computing of a larger type which embeds a var decl as a member declaration. This is especially true if the var decl indirectly references the larger type. The only way to cache the value of a var decl would be to wait after all canonical types have been computed. We'd then seal all types. After that sealing happens, we can cache var decls starting from the top-level ones. (function_decl:#️⃣:operator()): Likewise. * src/abg-ir.cc (get_type_scope): Define new functions. * src/abg-reader.cc (read_is_declaration_only): Declare this function earlier. (typedef const_types_map_it): Adjust this to make it point to a map of string and vector of types, as opposed to a map to string and type as it was before. (typedef types_map_it): New typedef. (read_context::map_id_and_node): Map a type id to the last xmlNodePtr that represent a *declaration*. That gives more leeway to the declaration resolution code to choose the right definition later. Otherwise, there are cases where the wrong definition. By wrong definition, I mean a definition that is different from the one chosen by the DWARF reading code, for a given declaration. Basically for a given ABI corpus, a type declaration resolve to the first definition seen in the corpus. (read_context::get_all_type_decls): Define new member function. (read_context::types_equal): Use qualified names only if both types have a scope. (read_context::key_type_decl): Now a given ID is associated to *all* the declarations and definition that have that ID. (read_translation_unit_from_input): Make sure the current corpus node points to the right node. (build_class_decl): Resolve class declarations to the first definition seen in the corpus. Key a type decl before reading its members as a reading a member can request the current decl. No need to try and canonicalize a member type, as build_class_decl() does that already. * tests/data/test-read-dwarf/test16-pr18904.so: New test binary input. * tests/data/test-read-dwarf/test16-pr18904.so.abi: New test output reference. * tests/test-read-dwarf.cc: Run the test above. * tests/data/Makefile.am: Add the new test input to source distribution. * tests/data/test-abidiff/test-PR18791-report0.txt: Adjust. * tests/data/test-read-dwarf/test13-pr18894.so.abi: Likewise. * tests/data/test-read-dwarf/test14-pr18893.so.abi: Likewise. * tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise. 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 | ||