Skip to content

Fix #12958 reopened Stack overflow with using namespace #6639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Jul 24, 2024
Merged

Fix #12958 reopened Stack overflow with using namespace #6639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8648c9
Update testsymboldatabase.cpp
chrchr-github Jul 24, 2024
4e2ddba
Update symboldatabase.cpp
chrchr-github Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6123,7 +6123,7 @@ const Scope *SymbolDatabase::findScopeByName(const std::string& name) const
//---------------------------------------------------------------------------

template<class S, class T, REQUIRES("S must be a Scope class", std::is_convertible<S*, const Scope*> ), REQUIRES("T must be a Type class", std::is_convertible<T*, const Type*> )>
S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
S* findRecordInNestedListImpl(S& thisScope, const std::string& name, bool isC, std::set<const Scope*>& visited)
{
for (S* scope: thisScope.nestedList) {
if (scope->className == name && scope->type != Scope::eFunction)
Expand All @@ -6136,9 +6136,10 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)
}

for (const auto& u : thisScope.usingList) {
if (!u.scope || u.scope == &thisScope)
if (!u.scope || u.scope == &thisScope || visited.find(u.scope) != visited.end())
continue;
S* nestedScope = const_cast<S*>(u.scope)->findRecordInNestedList(name, false);
visited.emplace(u.scope);
S* nestedScope = findRecordInNestedListImpl<S, T>(const_cast<S&>(*u.scope), name, false, visited);
if (nestedScope)
return nestedScope;
}
Expand All @@ -6158,12 +6159,14 @@ S* findRecordInNestedListImpl(S& thisScope, const std::string & name, bool isC)

const Scope* Scope::findRecordInNestedList(const std::string & name, bool isC) const
{
return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC);
std::set<const Scope*> visited;
return findRecordInNestedListImpl<const Scope, const Type>(*this, name, isC, visited);
}

Scope* Scope::findRecordInNestedList(const std::string & name, bool isC)
{
return findRecordInNestedListImpl<Scope, Type>(*this, name, isC);
std::set<const Scope*> visited;
return findRecordInNestedListImpl<Scope, Type>(*this, name, isC, visited);
}

//---------------------------------------------------------------------------
Expand Down
14 changes: 14 additions & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5609,6 +5609,20 @@ class TestSymbolDatabase : public TestFixture {
ASSERT(db != nullptr);
ASSERT_EQUALS("", errout_str());
}
{
GET_SYMBOL_DB_DBG("namespace N {\n"
" struct S {};\n"
"}\n"
"namespace O {\n"
" using namespace N;\n"
"}\n"
"namespace N {\n"
" using namespace O;\n"
" struct T {};\n"
"}\n");
ASSERT(db != nullptr);
ASSERT_EQUALS("", errout_str());
}
}

void createSymbolDatabaseFindAllScopes1() {
Expand Down