Skip to content
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

Jump to bottom

fixed #12424 - CppCheck: provide a preprocessor object with --clang (fixes assert) #6065

Merged
merged 1 commit into from
Feb 28, 2024
Merged

fixed #12424 - CppCheck: provide a preprocessor object with --clang (fixes assert) #6065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,9 +499,10 @@ unsigned int CppCheck::checkClang(const std::string &path)
}

try {
std::istringstream ast(output2);
Tokenizer tokenizer(mSettings, this);
Preprocessor preprocessor(mSettings, this);
Tokenizer tokenizer(mSettings, this, &preprocessor);
tokenizer.list.appendFileIfNew(path);
std::istringstream ast(output2);
clangimport::parseClangAstDump(tokenizer, ast);
ValueFlow::setValues(tokenizer.list,
const_cast<SymbolDatabase&>(*tokenizer.getSymbolDatabase()),
Expand Down
13 changes: 12 additions & 1 deletion test/cli/clang-import_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,15 @@ def test_log(tmpdir):
'Checking {} ...'.format(test_file).replace('\\', '/'),
]

assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)
assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)


def test_warning(tmpdir): # #12424
test_file = os.path.join(tmpdir, 'test_2')
with open(test_file, 'wt') as f:
f.write('''void f() {}''')

exitcode, stdout, stderr = cppcheck(['-q', '--enable=warning', '--clang', test_file])
assert exitcode == 0, stderr # do not assert
assert stdout == ''
assert stderr == ''
Loading