Skip to content

Fix #13767 (SymbolDatabase: refactorings. Remove always false condition. Make loop more robust) #7457

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 1 commit into from
May 12, 2025
Merged

Fix #13767 (SymbolDatabase: refactorings. Remove always false condition. Make loop more robust) #7457

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
8 changes: 4 additions & 4 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1803,8 +1803,6 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
if (Token::Match(dimension.tok->previous(), "[<,]")) {
if (dimension.known)
continue;
if (!Token::Match(dimension.tok->previous(), "[<,]"))
Comment thread
danmar marked this conversation as resolved.
continue;

// In template arguments, there might not be AST
// Determine size by using the "raw tokens"
Expand Down Expand Up @@ -3703,8 +3701,10 @@ bool Variable::arrayDimensions(const Settings& settings, bool& isContainer)
isContainer = false;
const Library::Container* container = (mTypeStartToken && mTypeStartToken->isCpp()) ? settings.library.detectContainer(mTypeStartToken) : nullptr;
if (container && container->arrayLike_indexOp && container->size_templateArgNo > 0) {
const Token* tok = Token::findsimplematch(mTypeStartToken, "<");
Comment thread
danmar marked this conversation as resolved.
if (tok) {
const Token* tok = mTypeStartToken;
while (Token::Match(tok, "%name%|::"))
tok = tok->next();
Comment thread
danmar marked this conversation as resolved.
if (tok && tok->str() == "<") {
isContainer = true;
Dimension dimension_;
tok = tok->next();
Expand Down
Loading