walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

TemplateSimplifier: Fix incorrect recursion when template is reused inside itself

This commit is contained in:
Daniel Marjamäki 2018-01-03 23:05:57 +01:00
parent 5eee9d6d18
commit a95108ebe3
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/templatesimplifier.cpp
View File

@ -1485,6 +1485,10 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
}
}
// already simplified
if (!Token::Match(iter2->token, "%name% <"))
continue;
if (iter2->name != templateDeclaration.name)
continue;

17
test/testsimplifytemplate.cpp
View File

@ -98,6 +98,7 @@ private:
TEST_CASE(template58); // #6021 - use after free (deleted tokens in simplifyCalculations)
TEST_CASE(template59); // #8051 - TemplateSimplifier::simplifyTemplateInstantiation failure
TEST_CASE(template60); // handling of methods outside template definition
TEST_CASE(template61); // daca2, kodi
TEST_CASE(template_specialization_1); // #7868 - template specialization template <typename T> struct S<C<T>> {..};
TEST_CASE(template_specialization_2); // #7868 - template specialization template <typename T> struct S<C<T>> {..};
TEST_CASE(template_enum); // #6299 Syntax error in complex enum declaration (including template)
@ -1119,6 +1120,22 @@ private:
ASSERT_EQUALS(exp, tok(code));
}
void template61() { // hang in daca, code extracted from kodi
const char code[] = "template <typename T> struct Foo {};\n"
"template <typename T> struct Bar {\n"
" void f1(Bar<T> x) {}\n"
" Foo<Bar<T>> f2() { }\n"
"};\n"
"Bar<int> c;";
const char exp[] = "Bar<int> c ; "
"struct Bar<int> {"
" void f1 ( Bar<int> x ) { }"
" Foo<Bar<int>> f2 ( ) { } "
"} ; "
"struct Foo<Bar<int>> { } ;";
ASSERT_EQUALS(exp, tok(code));
}
void template_specialization_1() { // #7868 - template specialization template <typename T> struct S<C<T>> {..};
const char code[] = "template <typename T> struct C {};\n"
"template <typename T> struct S {a};\n"