feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Fix endless loop in lookup on Windows

Browse Source 
...for templates with typedefs referencing the respectively other
template (basic_ostream <-> ostreambuf_iterator).

Tested with MSVC 2013.

Regression introduced by ba42ceb0cb.

Task-number: QTCREATORBUG-13064
Task-number: QTCREATORBUG-13065
Change-Id: I71a45c720663a73c3302eb7da731e6ad2d8f0fbd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-09-24 10:18:31 +02:00
parent c9f309f9be
commit 4da91bef8d
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/cplusplus/LookupContext.cpp
View File

@@ -92,7 +92,10 @@ static bool isNestedInstantiationEnclosingTemplate(
ClassOrNamespace *nestedClassOrNamespaceInstantiation, ClassOrNamespace *nestedClassOrNamespaceInstantiation,
ClassOrNamespace *enclosingTemplateClassInstantiation) ClassOrNamespace *enclosingTemplateClassInstantiation)
{ {
while (enclosingTemplateClassInstantiation) { QList<ClassOrNamespace *> processed;
while (enclosingTemplateClassInstantiation
&& !processed.contains(enclosingTemplateClassInstantiation)) {
processed.append(enclosingTemplateClassInstantiation);
if (enclosingTemplateClassInstantiation == nestedClassOrNamespaceInstantiation) if (enclosingTemplateClassInstantiation == nestedClassOrNamespaceInstantiation)
return false; return false;
enclosingTemplateClassInstantiation = enclosingTemplateClassInstantiation->parent(); enclosingTemplateClassInstantiation = enclosingTemplateClassInstantiation->parent();

46
tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
View File

@@ -191,6 +191,8 @@ private slots:
void test_checksymbols_macroUses(); void test_checksymbols_macroUses();
void test_checksymbols_macroUses_data(); void test_checksymbols_macroUses_data();
void test_checksymbols_infiniteLoop();
}; };
void tst_CheckSymbols::test_checksymbols() void tst_CheckSymbols::test_checksymbols()
@@ -1751,5 +1753,49 @@ void tst_CheckSymbols::test_checksymbols_macroUses_data()
<< Use(2, 11, 3, Highlighting::MacroUse)); << Use(2, 11, 3, Highlighting::MacroUse));
} }
void tst_CheckSymbols::test_checksymbols_infiniteLoop()
{
const QByteArray source1 =
"#include \"file2.h\"\n"
"\n"
"template<class _Elem, class _Traits>\n"
"class basic_ios {\n"
" typedef basic_ostream<_Elem, _Traits> _Myos;\n"
"};\n"
"\n"
"template<class _Elem, class _Traits>\n"
"class basic_ostream {\n"
" typedef basic_ostream<_Elem, _Traits> _Myt;\n"
" typedef ostreambuf_iterator<_Elem, _Traits> _Iter;\n"
"};\n"
;
const QString filePath1 = QDir::tempPath() + QLatin1String("/file1.h");
CppTools::Tests::TestCase::writeFile(filePath1, source1);
const QByteArray source2 =
"template<class _Elem, class _Traits>\n"
"class basic_streambuf {\n"
" typedef basic_streambuf<_Elem, _Traits> _Myt;\n"
"};\n"
"\n"
"template<class _Elem, class _Traits>\n"
"class ostreambuf_iterator {\n"
" typedef _Traits traits_type;\n"
" typedef basic_streambuf<_Elem, _Traits> streambuf_type;\n"
" typedef basic_ostream<_Elem, _Traits> ostream_type;\n"
"};\n"
;
const QString filePath2 = QDir::tempPath() + QLatin1String("/file2.h");
CppTools::Tests::TestCase::writeFile(filePath2, source2);
const Document::Ptr document1 = TestCase::createDocument(filePath1, source1);
document1->addIncludeFile(Document::Include("file2.h", filePath2, 1, Client::IncludeLocal));
Snapshot snapshot;
snapshot.insert(document1);
snapshot.insert(TestCase::createDocument(filePath2, source2));
TestCase::runCheckSymbols(document1, snapshot);
}
QTEST_APPLESS_MAIN(tst_CheckSymbols) QTEST_APPLESS_MAIN(tst_CheckSymbols)
#include "tst_checksymbols.moc" #include "tst_checksymbols.moc"