[applied] Bug 31513 - Fix fallout of initial patch
Commit Message
Hello,
As Jianfeng Fan pointed out in a comment at
https://sourceware.org/bugzilla/show_bug.cgi?id=31513#c14, there is a
thinko in commit
https://sourceware.org/git/?p=libabigail.git;a=commit;h=338394f5454990c715b52bb4bc2ed47b39d6528b.
has_subtype_changes forgets to reset the s_member when f_member is
reset. Both variables should be reset in tandem, just like what is
done in has_offset_changes.
Fixed thus.
* src/abg-comp-filter.cc (has_subtype_changes): Reset s_member in
the loop, just like f_member.
* tests/data/test-abidiff-exit/PR31513/non-regr/report1.txt: Adjust.
* tests/data/test-abidiff-exit/PR31513/non-regr/report2.txt: Adjust.
* tests/test-abidiff-exit.cc (in_out_specs): Adjust.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
src/abg-comp-filter.cc | 2 +-
.../test-abidiff-exit/PR31513/non-regr/report1.txt | 11 +----------
.../test-abidiff-exit/PR31513/non-regr/report2.txt | 11 +----------
tests/test-abidiff-exit.cc | 4 ++--
4 files changed, 5 insertions(+), 23 deletions(-)
@@ -331,12 +331,12 @@ has_subtype_changes(const string_decl_base_sptr_map& f_data_members,
diff_context_sptr ctxt)
{
// Now compare the offsets of the data members collected.
- var_decl_sptr s_member;
for (auto entry : f_data_members)
{
var_decl_sptr f_member = is_var_decl(entry.second);
ABG_ASSERT(f_member);
+ var_decl_sptr s_member;
auto i = s_data_members.find(entry.first);
if (i == s_data_members.end())
{
@@ -1,12 +1,3 @@
-Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Functions changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added function
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-1 function with some indirect sub-type change:
-
- [C] 'function int foo(type&)' at test1-v0.cc:10:1 has some indirect sub-type changes:
- parameter 1 of type 'type&' has sub-type changes:
- in referenced type 'struct type' at test1-v1.cc:8:1:
- type size hasn't changed
- 1 base class insertion:
- struct base at test1-v1.cc:2:1
-
@@ -1,12 +1,3 @@
-Functions changes summary: 0 Removed, 1 Changed, 0 Added function
+Functions changes summary: 0 Removed, 0 Changed (1 filtered out), 0 Added function
Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
-1 function with some indirect sub-type change:
-
- [C] 'function int foo(type&)' at test2-v0.cc:10:1 has some indirect sub-type changes:
- parameter 1 of type 'type&' has sub-type changes:
- in referenced type 'struct type' at test2-v1.cc:9:1:
- type size hasn't changed
- 1 base class insertion:
- struct base at test2-v1.cc:2:1
-
@@ -1331,7 +1331,7 @@ InOutSpec in_out_specs[] =
"",
"",
"--no-default-suppression",
- abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+ abigail::tools_utils::ABIDIFF_OK,
"data/test-abidiff-exit/PR31513/non-regr/report1.txt",
"output/test-abidiff-exit/PR31513/non-regr/report1.txt"
},
@@ -1346,7 +1346,7 @@ InOutSpec in_out_specs[] =
"",
"",
"--no-default-suppression",
- abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+ abigail::tools_utils::ABIDIFF_OK,
"data/test-abidiff-exit/PR31513/non-regr/report2.txt",
"output/test-abidiff-exit/PR31513/non-regr/report2.txt"
},