RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2024-12-17 07:24:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug 22075 - data_member_diff_comp forgets data members names

Browse Source 
This patch makes the data_member_diff_comp comparison functor consider
all the properties local to the data member: that is, its offset and
its name.

It used to only take the offset into account.

This makes sure that offset change reports have a stable ordering and
thus makes the runtestdiffpkg testcase succeeds on debian-i386.

	* src/abg-comparison.cc (data_member_diff_comp): Make the
	comparison take the qualified name of the data member into
	account.  Also, if the initial offset and qualified names of the
	data members of the diff nodes are equal, consider the offset and
	qualified names of the new data members.

Signed-off-by: Mark Wielaard <mark@klomp.org>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Mark Wielaard 2017-09-11 22:50:22 +02:00 committed by Dodji Seketeli
parent 74105ff84b
commit 60a4743af4
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/abg-comparison.cc
View File

@ -6730,8 +6730,10 @@ sort_string_base_diff_sptr_map(const string_base_diff_sptr_map& map,
} }
/// A comparison functor to compare two instances of @ref var_diff /// A comparison functor to compare two instances of @ref var_diff
/// that represent changed data members based on the offset of their /// that represent changed data members based on the offset of the
/// initial value. /// initial data members, or if equal, based on their qualified name.
/// If equal again, then the offset and qualified name of the new data
/// members are considered.
struct data_member_diff_comp struct data_member_diff_comp
{ {
/// @param f the first change to data member to take into account /// @param f the first change to data member to take into account
@ -6749,7 +6751,44 @@ struct data_member_diff_comp
assert(is_data_member(first_dm)); assert(is_data_member(first_dm));
assert(is_data_member(second_dm)); assert(is_data_member(second_dm));
return get_data_member_offset(first_dm) < get_data_member_offset(second_dm); size_t off1 = get_data_member_offset(first_dm);
size_t off2 = get_data_member_offset(second_dm);
if (off1 != off2)
return off1 < off2;
// The two offsets of the initial data members are the same. So
// lets compare the qualified name of these initial data members.
string name1 = first_dm->get_qualified_name();
string name2 = second_dm->get_qualified_name();
if (name1 != name2)
return name1 < name2;
// The offsets and the qualified names of the initial data members
// are the same. Let's now compare the offsets of the *new* data
// members.
first_dm = f->second_var();
second_dm = s->second_var();
assert(is_data_member(first_dm));
assert(is_data_member(second_dm));
off1 = get_data_member_offset(first_dm);
off2 = get_data_member_offset(second_dm);
if (off1 != off2)
return off1 < off2;
// The offsets of the new data members are the same, dang! Let's
// compare the qualified names of these new data members then.
name1 = first_dm->get_qualified_name();
name2 = second_dm->get_qualified_name();
return name1 < name2;
} }
}; // end struct var_diff_comp }; // end struct var_diff_comp