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

Fixed: FP return reference to thread_local variable (#1758)

This commit is contained in:
Frank Zingsheim 2019-03-27 12:22:53 +01:00 committed by Daniel Marjamäki
parent 88dc74929a
commit 574b77cf1f
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/tokenize.cpp
View File

@ -9765,9 +9765,11 @@ void Tokenizer::simplifyKeyword()
Token::createMutualLinks(braceStart, braceEnd); Token::createMutualLinks(braceStart, braceEnd);
} }
// 3) thread_local // 3) thread_local -> static
// on single thread thread_local has the effect of static
else if (tok->str() == "thread_local") { else if (tok->str() == "thread_local") {
tok->deleteThis(); tok->originalName(tok->str());
tok->str("static");
} }
} }
} }

7
test/testautovariables.cpp
View File

@ -882,6 +882,13 @@ private:
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("std::vector<int> &foo()\n"
"{\n"
" thread_local std::vector<int> v;\n"
" return v;\n"
"}");
ASSERT_EQUALS("", errout.str());
check("std::string hello()\n" check("std::string hello()\n"
"{\n" "{\n"
" return \"hello\";\n" " return \"hello\";\n"

2
test/testtokenize.cpp
View File

@ -4132,7 +4132,7 @@ private:
// Ticket #8679 // Ticket #8679
const char code[] = "thread_local void *thread_local_var; " const char code[] = "thread_local void *thread_local_var; "
"__thread void *thread_local_var_2;"; "__thread void *thread_local_var_2;";
ASSERT_EQUALS("void * thread_local_var ; " ASSERT_EQUALS("static void * thread_local_var ; "
"void * thread_local_var_2 ;", tokenizeAndStringify(code)); "void * thread_local_var_2 ;", tokenizeAndStringify(code));
} }
} }