Skip to content

Fix 10336: AST cyclic dependency on valid C++ code #3331

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
danmar merged 3 commits into from
Jul 9, 2021
Merged

Fix 10336: AST cyclic dependency on valid C++ code #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a96268
Fix 10336: AST cyclic dependency on valid C++ code
pfultz2 Jul 8, 2021
3b1a89a
Format1
pfultz2 Jul 8, 2021
15a64a7
Format2
pfultz2 Jul 8, 2021
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
3 changes: 2 additions & 1 deletion lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
//---------------------------------------------------------------------------
#include "tokenlist.h"

#include "astutils.h"
#include "errorlogger.h"
#include "library.h"
#include "path.h"
Expand Down Expand Up @@ -1351,7 +1352,7 @@ static Token * createAstAtToken(Token *tok, bool cpp);
// Compile inner expressions inside inner ({..}) and lambda bodies
static void createAstAtTokenInner(Token * const tok1, const Token *endToken, bool cpp)
{
for (Token *tok = tok1; tok && tok != endToken; tok = tok ? tok->next() : nullptr) {
for (Token* tok = tok1; precedes(tok, endToken); tok = tok ? tok->next() : nullptr) {
if (tok->str() == "{" && !iscpp11init(tok)) {
const Token * const endToken2 = tok->link();
bool hasAst = false;
Expand Down
13 changes: 13 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6620,6 +6620,19 @@ class TestTokenizer : public TestFixture {
"}\n"));

ASSERT_NO_THROW(tokenizeAndStringify("a<b?0:1>()==3;"));

// #10336
ASSERT_NO_THROW(tokenizeAndStringify("struct a {\n"
" template <class b> a(b);\n"
"};\n"
"struct c;\n"
"void fn1(int, a);\n"
"void f() { fn1(0, {a{0}}); }\n"
"template <class> std::vector<c> g() {\n"
" int d;\n"
" for (size_t e = 0; e < d; e++)\n"
" ;\n"
"}\n"));
}

void checkNamespaces() {
Expand Down