Rename member_function_is_virtual to get_member_function_is_virtual
* include/abg-fwd.h (get_member_function_is_virtual): Renamed the
declaration of member_function_is_virtual into this.
* src/abg-ir.cc (get_member_function_is_virtual): Likewise for its
definition.
* include/abg-ir.h (class decl_base): Adjust the friend function
member_function_is_virtual references.
* src/abg-comp-filter.cc (has_virtual_mem_fn_change)
(has_non_virtual_mem_fn_change): Adjust.
* src/abg-comparison.cc (represent)
(SKIP_MEM_FN_IF_VIRTUALITY_DISALLOWED, class_diff::report):
Likewise.
* src/abg-hash.cc (class_decl:#️⃣:operator()): Likewise.
(function_decl::clone, class_decl::add_member_function): Adjust.
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
parent
4e44ee383c
commit
46dbc9ce41
|
@ -326,10 +326,10 @@ size_t
|
|||
get_member_function_vtable_offset(const shared_ptr<function_decl>);
|
||||
|
||||
bool
|
||||
member_function_is_virtual(const function_decl&);
|
||||
get_member_function_is_virtual(const function_decl&);
|
||||
|
||||
bool
|
||||
member_function_is_virtual(const shared_ptr<function_decl>);
|
||||
get_member_function_is_virtual(const shared_ptr<function_decl>);
|
||||
|
||||
void
|
||||
set_member_function_is_virtual(const function_decl&, bool);
|
||||
|
|
|
@ -729,7 +729,7 @@ public:
|
|||
set_member_is_static(decl_base_sptr d, bool s);
|
||||
|
||||
friend bool
|
||||
member_function_is_virtual(const function_decl& f);
|
||||
get_member_function_is_virtual(const function_decl& f);
|
||||
|
||||
friend void
|
||||
set_member_function_is_virtual(const function_decl&, bool);
|
||||
|
|
|
@ -458,7 +458,7 @@ has_virtual_mem_fn_change(const class_diff* diff)
|
|||
i != diff->deleted_member_fns().end();
|
||||
++i)
|
||||
{
|
||||
if (member_function_is_virtual(i->second))
|
||||
if (get_member_function_is_virtual(i->second))
|
||||
{
|
||||
// Do not consider a virtual function that got deleted from
|
||||
// an offset and re-inserted at the same offset as a
|
||||
|
@ -479,7 +479,7 @@ has_virtual_mem_fn_change(const class_diff* diff)
|
|||
i != diff->inserted_member_fns().end();
|
||||
++i)
|
||||
{
|
||||
if (member_function_is_virtual(i->second))
|
||||
if (get_member_function_is_virtual(i->second))
|
||||
{
|
||||
// Do not consider a virtual function that got deleted from
|
||||
// an offset and re-inserted at the same offset as a
|
||||
|
@ -499,8 +499,8 @@ has_virtual_mem_fn_change(const class_diff* diff)
|
|||
diff->changed_member_fns().begin();
|
||||
i != diff->changed_member_fns().end();
|
||||
++i)
|
||||
if(member_function_is_virtual(i->second.first)
|
||||
|| !member_function_is_virtual(i->second.second))
|
||||
if(get_member_function_is_virtual(i->second.first)
|
||||
|| !get_member_function_is_virtual(i->second.second))
|
||||
{
|
||||
if (get_member_function_vtable_offset(i->second.first)
|
||||
== get_member_function_vtable_offset(i->second.second))
|
||||
|
@ -543,22 +543,22 @@ has_non_virtual_mem_fn_change(const class_diff* diff)
|
|||
diff->deleted_member_fns().begin();
|
||||
i != diff->deleted_member_fns().end();
|
||||
++i)
|
||||
if (!member_function_is_virtual(i->second))
|
||||
if (!get_member_function_is_virtual(i->second))
|
||||
return true;
|
||||
|
||||
for (string_member_function_sptr_map::const_iterator i =
|
||||
diff->inserted_member_fns().begin();
|
||||
i != diff->inserted_member_fns().end();
|
||||
++i)
|
||||
if (!member_function_is_virtual(i->second))
|
||||
if (!get_member_function_is_virtual(i->second))
|
||||
return true;
|
||||
|
||||
for (string_changed_member_function_sptr_map::const_iterator i =
|
||||
diff->changed_member_fns().begin();
|
||||
i != diff->changed_member_fns().end();
|
||||
++i)
|
||||
if(!member_function_is_virtual(i->second.first)
|
||||
&& !member_function_is_virtual(i->second.second))
|
||||
if(!get_member_function_is_virtual(i->second.first)
|
||||
&& !get_member_function_is_virtual(i->second.second))
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
|
|
@ -1526,7 +1526,7 @@ represent(diff_context& ctxt,
|
|||
assert(meth);
|
||||
|
||||
out << "'" << mem_fn->get_pretty_representation() << "'";
|
||||
if (member_function_is_virtual(mem_fn))
|
||||
if (get_member_function_is_virtual(mem_fn))
|
||||
out << ", virtual at voffset "
|
||||
<< get_member_function_vtable_offset(mem_fn)
|
||||
<< "/"
|
||||
|
@ -3761,8 +3761,8 @@ class_diff::priv::count_filtered_changed_dm(const diff_context_sptr& ctxt)
|
|||
/// functions.
|
||||
#define SKIP_MEM_FN_IF_VIRTUALITY_DISALLOWED \
|
||||
do { \
|
||||
if (member_function_is_virtual(f) \
|
||||
|| member_function_is_virtual(s)) \
|
||||
if (get_member_function_is_virtual(f) \
|
||||
|| get_member_function_is_virtual(s)) \
|
||||
{ \
|
||||
if (!(allowed_category | VIRTUAL_MEMBER_CHANGE_CATEGORY)) \
|
||||
continue; \
|
||||
|
@ -4257,7 +4257,7 @@ class_diff::report(ostream& out, const string& indent) const
|
|||
{
|
||||
if (!(context()->get_allowed_category()
|
||||
& NON_VIRT_MEM_FUN_CHANGE_CATEGORY)
|
||||
&& !member_function_is_virtual(i->second))
|
||||
&& !get_member_function_is_virtual(i->second))
|
||||
continue;
|
||||
|
||||
if (i != priv_->deleted_member_functions_.begin())
|
||||
|
@ -4283,7 +4283,7 @@ class_diff::report(ostream& out, const string& indent) const
|
|||
{
|
||||
if (!(context()->get_allowed_category()
|
||||
& NON_VIRT_MEM_FUN_CHANGE_CATEGORY)
|
||||
&& !member_function_is_virtual(i->second))
|
||||
&& !get_member_function_is_virtual(i->second))
|
||||
continue;
|
||||
|
||||
if (i != priv_->inserted_member_functions_.begin())
|
||||
|
@ -4309,8 +4309,8 @@ class_diff::report(ostream& out, const string& indent) const
|
|||
{
|
||||
if (!(context()->get_allowed_category()
|
||||
& NON_VIRT_MEM_FUN_CHANGE_CATEGORY)
|
||||
&& !member_function_is_virtual(i->second.first)
|
||||
&& !member_function_is_virtual(i->second.second))
|
||||
&& !get_member_function_is_virtual(i->second.first)
|
||||
&& !get_member_function_is_virtual(i->second.second))
|
||||
continue;
|
||||
|
||||
class_decl::method_decl_sptr f = i->second.first;
|
||||
|
|
|
@ -648,7 +648,7 @@ class_decl::hash::operator()(const class_decl& t) const
|
|||
t.get_member_functions().begin();
|
||||
f != t.get_member_functions().end();
|
||||
++f)
|
||||
if (member_function_is_virtual(*f))
|
||||
if (get_member_function_is_virtual(*f))
|
||||
v = hashing::combine_hashes(v, hash_member_fn(**f));
|
||||
|
||||
// Hash member function templates
|
||||
|
|
|
@ -1990,7 +1990,7 @@ get_member_function_vtable_offset(const function_decl_sptr f)
|
|||
///
|
||||
/// @return true iff a @p mem_fn is virtual.
|
||||
bool
|
||||
member_function_is_virtual(const function_decl& f)
|
||||
get_member_function_is_virtual(const function_decl& f)
|
||||
{
|
||||
assert(is_member_function(f));
|
||||
|
||||
|
@ -2010,8 +2010,8 @@ member_function_is_virtual(const function_decl& f)
|
|||
///
|
||||
/// @return true iff a @p mem_fn is virtual.
|
||||
bool
|
||||
member_function_is_virtual(const function_decl_sptr mem_fn)
|
||||
{return mem_fn ? member_function_is_virtual(*mem_fn) : false;}
|
||||
get_member_function_is_virtual(const function_decl_sptr mem_fn)
|
||||
{return mem_fn ? get_member_function_is_virtual(*mem_fn) : false;}
|
||||
|
||||
/// Set the virtual-ness of a member function.
|
||||
///
|
||||
|
@ -5042,7 +5042,7 @@ function_decl::clone() const
|
|||
class_decl* scope = dynamic_cast<class_decl*>(get_scope());
|
||||
assert(scope);
|
||||
scope->add_member_function(m, get_member_access_specifier(*this),
|
||||
member_function_is_virtual(*this),
|
||||
get_member_function_is_virtual(*this),
|
||||
get_member_function_vtable_offset(*this),
|
||||
get_member_is_static(*this),
|
||||
get_member_function_is_ctor(*this),
|
||||
|
@ -5942,7 +5942,7 @@ class_decl::add_member_function(method_decl_sptr f,
|
|||
f->set_context_rel(ctxt);
|
||||
priv_->member_functions_.push_back(f);
|
||||
scope_decl::add_member_decl(f);
|
||||
if (member_function_is_virtual(f))
|
||||
if (get_member_function_is_virtual(f))
|
||||
priv_->virtual_mem_fns_.push_back(f);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue