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

Fixed #8314 (TemplateSimplifer crash)

This commit is contained in:
Daniel Marjamäki 2018-01-06 15:16:03 +01:00
parent 1ad797d220
commit 98b45ffbc0
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/templatesimplifier.cpp
View File

@ -982,6 +982,17 @@ void TemplateSimplifier::expandTemplate(
Token::Match(tok3, "%name% <") &&
fullName == getFullName(scopeInfo, tok3->str()) &&
TemplateSimplifier::instantiateMatch(tok3, typeParametersInDeclaration.size(), ":: ~| %name% (")) {
// there must be template..
bool istemplate = false;
for (const Token *prev = tok3; prev && !Token::Match(prev, "[;{}]"); prev = prev->previous()) {
if (prev->str() == "template") {
istemplate = true;
break;
}
}
if (!istemplate)
continue;
const Token *tok4 = tok3->next()->findClosingBracket();
while (tok4 && tok4->str() != "(")
tok4 = tok4->next();

28
test/testsimplifytemplate.cpp
View File

@ -99,6 +99,7 @@ private:
TEST_CASE(template59); // #8051 - TemplateSimplifier::simplifyTemplateInstantiation failure
TEST_CASE(template60); // handling of methods outside template definition
TEST_CASE(template61); // daca2, kodi
TEST_CASE(template62); // #8314 - inner template instantiation
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)
@ -547,16 +548,8 @@ private:
void template20() {
// Ticket #1788 - the destructor implementation is lost
const char code[] = "template <class T> class A\n"
"{\n"
"public:\n"
" ~A();\n"
"};\n"
"\n"
"template <class T> A<T>::~A()\n"
"{\n"
"}\n"
"\n"
const char code[] = "template <class T> class A { public: ~A(); };\n"
"template <class T> A<T>::~A() {}\n"
"A<int> a;\n";
// The expected result..
@ -1137,6 +1130,21 @@ private:
ASSERT_EQUALS(exp, tok(code));
}
void template62() { // #8314
const char code[] = "template <class T> struct C1 {};\n"
"template <class T> void f() { x = y ? C1<int>::allocate(1) : 0; }\n"
"template <class T, unsigned S> class C3 {};\n"
"template <class T, unsigned S> C3<T, S>::C3(const C3<T, S> &v) { C1<T *> c1; }\n"
"C3<int,6> c3;";
const char exp[] = "template < class T > void f ( ) { x = y ? C1 < int > :: allocate ( 1 ) : 0 ; } "
"template < class T , int S > C3 < T , S > :: C3 ( const C3 < T , S > & v ) { C1 < T * > c1 ; } "
"C3<int,6> c3 ; "
"class C3<int,6> { } ; "
"C3<int,6> :: C3<int,6> ( const C3<int,6> & v ) { C1<int*> c1 ; } "
"struct C1<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"