RepoMirrors/libabigail
1
0
Fork 0
mirror of git://sourceware.org/git/libabigail.git synced 2025-03-05 06:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

abg-ir.cc: Refactor operator== methods with helper function

Browse Source 
Many of the operator== definitions in this source file follow the same
pattern:

- First, canonical comparison is attempted if canonical types are
  present.
- Otherwise, the comparison is performed structurally using the
  'equals' function.

This commit refactors the common logic into a templated helper
function named "try_canonical_compare".

There are no behavioural changes.

	* src/abg-ir.cc (try_canonical_compare): New template function.
	(type_decl::operator==): Use it here.
	(scope_type_decl::operator==): Likewise.
	(qualified_type_def::operator==): Likewise.
	(pointer_type_def::operator==): Likewise.
	(reference_type_def::operator==): Likewise.
	(array_type_def::subrange_type::operator==): Likewise.
	(array_type_def::operator==): Likewise.
	(enum_type_decl::operator==): Likewise.
	(typedef_decl::operator==): Likewise.
	(function_type::operator==): Likewise.
	(class_or_union::operator==): Likewise.
	(class_decl::operator==): Likewise.
	(union_decl::operator==): Likewise.

Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Giuliano Procida 2020-07-08 10:53:14 +01:00 committed by Dodji Seketeli
parent dfd8314159
commit 0fd2fb93eb
1 changed files with 59 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

166
src/abg-ir.cc
View File

@ -651,6 +651,25 @@ struct type_name_comp
{return operator()(type_base_sptr(l), type_base_sptr(r));}
}; // end struct type_name_comp
/// Compare two types by comparing their canonical types if present.
///
/// If the canonical types are not present (because the types have not
/// yet been canonicalized, for instance) then the types are compared
/// structurally.
///
/// @param l the first type to take into account in the comparison.
///
/// @param r the second type to take into account in the comparison.
template<typename T>
bool
try_canonical_compare(const T *l, const T *r)
{
if (const type_base *lc = l->get_naked_canonical_type())
if (const type_base *rc = r->get_naked_canonical_type())
return lc == rc;
return equals(*l, *r, 0);
}
/// Getter of all types types sorted by their pretty representation.
///
/// @return a sorted vector of all types sorted by their pretty
@ -12904,11 +12923,7 @@ type_decl::operator==(const decl_base& o) const
const type_decl* other = dynamic_cast<const type_decl*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Return true if both types equals.
@ -13085,11 +13100,7 @@ scope_type_decl::operator==(const decl_base& o) const
const scope_type_decl* other = dynamic_cast<const scope_type_decl*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Equality operator between two scope_type_decl.
@ -13453,11 +13464,7 @@ qualified_type_def::operator==(const decl_base& o) const
dynamic_cast<const qualified_type_def*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Equality operator for qualified types.
@ -13824,14 +13831,7 @@ pointer_type_def::operator==(const decl_base& o) const
const pointer_type_def* other = is_pointer_type(&o);
if (!other)
return false;
type_base* canonical_type = get_naked_canonical_type();
type_base* other_canonical_type = other->get_naked_canonical_type();
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Return true iff both instances of pointer_type_def are equal.
@ -14135,14 +14135,7 @@ reference_type_def::operator==(const decl_base& o) const
dynamic_cast<const reference_type_def*>(&o);
if (!other)
return false;
type_base* canonical_type = get_naked_canonical_type();
type_base* other_canonical_type = other->get_naked_canonical_type();
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Equality operator of the @ref reference_type_def type.
@ -14684,11 +14677,7 @@ array_type_def::subrange_type::operator==(const decl_base& o) const
dynamic_cast<const subrange_type*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Equality operator.
@ -15006,11 +14995,7 @@ array_type_def::operator==(const decl_base& o) const
dynamic_cast<const array_type_def*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
bool
@ -15485,11 +15470,7 @@ enum_type_decl::operator==(const decl_base& o) const
const enum_type_decl* op = dynamic_cast<const enum_type_decl*>(&o);
if (!op)
return false;
if (get_naked_canonical_type() && op->get_naked_canonical_type())
return get_naked_canonical_type() == op->get_naked_canonical_type();
return equals(*this, *op, 0);
return try_canonical_compare(this, op);
}
/// Equality operator.
@ -15839,11 +15820,7 @@ typedef_decl::operator==(const decl_base& o) const
const typedef_decl* other = dynamic_cast<const typedef_decl*>(&o);
if (!other)
return false;
if (get_naked_canonical_type() && other->get_naked_canonical_type())
return get_naked_canonical_type() == other->get_naked_canonical_type();
return equals(*this, *other, 0);
return try_canonical_compare(this, other);
}
/// Equality operator
@ -16934,14 +16911,7 @@ function_type::operator==(const type_base& other) const
const function_type* o = dynamic_cast<const function_type*>(&other);
if (!o)
return false;
type_base* canonical_type = get_naked_canonical_type();
type_base* other_canonical_type = other.get_naked_canonical_type();
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
return equals(*this, *o, 0);
return try_canonical_compare(this, o);
}
/// Return a copy of the pretty representation of the current @ref
@ -19201,29 +19171,22 @@ class_or_union::operator==(const decl_base& other) const
if (!op)
return false;
type_base *canonical_type = get_naked_canonical_type(),
*other_canonical_type = op->get_naked_canonical_type();
// If this is a declaration only class with no canonical class, use
// the canonical type of the definition, if any.
if (!canonical_type
&& get_is_declaration_only()
&& get_naked_definition_of_declaration())
canonical_type = is_class_or_union_type
(get_naked_definition_of_declaration())->get_naked_canonical_type();
// If this is a decl-only type (and thus with no canonical type),
// use the canonical type of the definition, if any.
const class_or_union *l = 0;
if (get_is_declaration_only())
l = dynamic_cast<const class_or_union*>(get_naked_definition_of_declaration());
if (l == 0)
l = this;
// Likewise for the other class.
if (!other_canonical_type
&& op->get_is_declaration_only()
&& op->get_naked_definition_of_declaration())
other_canonical_type =
is_class_or_union_type
(op->get_naked_definition_of_declaration())->get_naked_canonical_type();
const class_or_union *r = 0;
if (op->get_is_declaration_only())
r = dynamic_cast<const class_or_union*>(op->get_naked_definition_of_declaration());
if (r == 0)
r = op;
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
return equals(*this, *op, 0);
return try_canonical_compare(l, r);
}
/// Equality operator.
@ -21032,30 +20995,26 @@ class_decl::operator==(const decl_base& other) const
if (!op)
return false;
type_base *canonical_type = get_naked_canonical_type(),
*other_canonical_type = op->get_naked_canonical_type();
// If this is a decl-only type (and thus with no canonical type),
// use the canonical type of the definition, if any.
const class_decl *l = 0;
if (get_is_declaration_only())
l = dynamic_cast<const class_decl*>(get_naked_definition_of_declaration());
if (l == 0)
l = this;
// If this is a declaration only class with no canonical class, use
// the canonical type of the definition, if any.
if (!canonical_type
&& get_is_declaration_only()
&& get_naked_definition_of_declaration())
canonical_type =
is_class_type
(get_naked_definition_of_declaration())->get_naked_canonical_type();
ABG_ASSERT(l);
// Likewise for the other class.
if (!other_canonical_type
&& op->get_is_declaration_only()
&& op->get_naked_definition_of_declaration())
other_canonical_type =
is_class_type
(op->get_naked_definition_of_declaration())->get_naked_canonical_type();
// Likewise for the other type.
const class_decl *r = 0;
if (op->get_is_declaration_only())
r = dynamic_cast<const class_decl*>(op->get_naked_definition_of_declaration());
if (r == 0)
r = op;
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
ABG_ASSERT(r);
return equals(*this, *op, 0);
return try_canonical_compare(l, r);
}
/// Equality operator for class_decl.
@ -21836,14 +21795,7 @@ union_decl::operator==(const decl_base& other) const
const union_decl* op = dynamic_cast<const union_decl*>(&other);
if (!op)
return false;
type_base *canonical_type = get_naked_canonical_type(),
*other_canonical_type = op->get_naked_canonical_type();
if (canonical_type && other_canonical_type)
return canonical_type == other_canonical_type;
return equals(*this, *op, 0);
return try_canonical_compare(this, op);
}
/// Equality operator for union_decl.