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

Consider enclosing template when comparing template parameters

Browse Source 
* src/abg-ir.cc (template_parameter::priv::comparison_started_):
	New data member.
	(template_parameter::priv::priv): Initialize it.
	(template_parameter::operator==): Compare the enclosing template
	too.  And avoid infinite recursion.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
This commit is contained in:
Dodji Seketeli 2014-11-10 16:32:50 +01:00
parent 69c95c6978
commit 192243188a
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/abg-ir.cc
View File

@ -7591,6 +7591,7 @@ class template_parameter::priv
unsigned index_;
template_decl_wptr template_decl_;
mutable bool hashing_started_;
mutable bool comparison_started_;
priv();
@ -7599,7 +7600,8 @@ public:
priv(unsigned index, template_decl_sptr enclosing_template_decl)
: index_(index),
template_decl_(enclosing_template_decl),
hashing_started_()
hashing_started_(),
comparison_started_()
{}
}; // end class template_parameter::priv
@ -7630,7 +7632,33 @@ template_parameter::set_hashing_has_started(bool f) const
bool
template_parameter::operator==(const template_parameter& o) const
{return (get_index() == o.get_index());}
{
if (get_index() != o.get_index())
return false;
if (priv_->comparison_started_)
return true;
bool result = false;
// Avoid inifite loops due to the fact that comparison the enclosing
// template decl might lead to comparing this very same template
// parameter with another one ...
priv_->comparison_started_ = true;
if (!!get_enclosing_template_decl() != !!o.get_enclosing_template_decl())
;
else if (get_enclosing_template_decl()
&& (*get_enclosing_template_decl()
!= *o.get_enclosing_template_decl()))
;
else
result = true;
priv_->comparison_started_ = false;
return result;
}
template_parameter::~template_parameter()
{}