Skip to content

Fix 13630, 9676: Template argument deduction using SymbolDatabase #8720

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

Open
pfultz2 wants to merge 62 commits into
base: main
Choose a base branch
from
+3,926 −294
Open

Fix 13630, 9676: Template argument deduction using SymbolDatabase #8720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
247fa8f
Deduce templates using a symboldatabase loop
Jul 9, 2026
0e15903
Make symboldatabase incremental
Jul 9, 2026
714e49d
Use settings flag
Jul 9, 2026
753563f
Incremental AST and ValueType
Jul 9, 2026
93e947d
Add some todo tests
Jul 10, 2026
0ce48a0
Refactor the functions
Jul 10, 2026
865f0aa
Simplify
Jul 10, 2026
5b3bdbb
Make a private static function
Jul 10, 2026
101146d
Remove some flags
Jul 10, 2026
7953636
Fix default statements
Jul 10, 2026
c6c1948
Set default values
Jul 10, 2026
2479ea6
Tweak the cli tests
Jul 13, 2026
3ea439c
Bump the other expected results
Jul 13, 2026
1aa06fc
Fix the results
Jul 14, 2026
0d8e8cc
Fix CI issues
Jul 20, 2026
6ee101e
Add unit tests
Jul 20, 2026
a26a03f
Fix ubsan error
Jul 20, 2026
fd68885
Fix selfcheck
Jul 20, 2026
d14c231
Increase timeout
Jul 21, 2026
24ffd62
Remove static_cast
Jul 21, 2026
def6944
Some cleanup
Jul 21, 2026
b2b88f4
Format
Jul 21, 2026
979097b
Add assert
Jul 22, 2026
d863b06
Fix cppcheck premuim warnings
Jul 22, 2026
990052b
Reduce copies of the tokenlist
Jul 22, 2026
5b8def6
Use stl algorithms
pfultz2 Jul 22, 2026
acac729
Format
pfultz2 Jul 22, 2026
e72577e
Merge branch 'main' into template-deduce-loop
pfultz2 Jul 23, 2026
8016585
Add test for 13630
pfultz2 Jul 27, 2026
771eb64
Fixes from feedback
pfultz2 Sep 19, 2026
0afea93
Merge
pfultz2 Sep 19, 2026
4f40e4f
Merge
pfultz2 Oct 5, 2026
2733865
Fix the FP introduced in this PR
pfultz2 Oct 5, 2026
c214761
Fix CI failures
pfultz2 Oct 6, 2026
82c5abe
merge
pfultz2 Oct 10, 2026
d85b405
Make the flag sticky
pfultz2 Oct 14, 2026
8124374
Handle enums
pfultz2 Oct 14, 2026
f2e794e
Support arrays
pfultz2 Oct 15, 2026
f0f7516
Handle const pointers
pfultz2 Oct 15, 2026
2d33a2b
Cleanup
pfultz2 Oct 15, 2026
73fd65a
merge
pfultz2 Oct 16, 2026
7ef5b93
Handle nested type deductions
pfultz2 Oct 16, 2026
71c2a23
Check namespace first
pfultz2 Oct 18, 2026
127f7a1
Handle shadowing
pfultz2 Oct 19, 2026
afef2a3
Rerun
pfultz2 Oct 20, 2026
06e5836
Use find_if
pfultz2 Oct 20, 2026
9283a76
Fix recursive deduction
pfultz2 Oct 21, 2026
255e8a3
Fix this instantiation
pfultz2 Oct 21, 2026
f72486f
Cleanup
pfultz2 Oct 22, 2026
8fc5ddb
Handle signed/unsigned
pfultz2 Oct 22, 2026
776ffea
Use pointer for DeductionCache
pfultz2 Oct 22, 2026
6cbe798
Fix cppcheck warnings
pfultz2 Oct 22, 2026
bc64680
Remove static cast
pfultz2 Oct 22, 2026
cf53504
Dont instantiate a template type
pfultz2 Oct 23, 2026
b217a3e
Fix the name
pfultz2 Oct 23, 2026
eecfc81
Merge
pfultz2 Oct 23, 2026
fd805f7
Parse function pointers in valuetype
pfultz2 Oct 25, 2026
aa96408
Propagate the bits
pfultz2 Oct 26, 2026
b130b46
Add release notes
pfultz2 Oct 27, 2026
f079e21
Merge
pfultz2 Oct 27, 2026
e521191
Merge
pfultz2 Oct 27, 2026
436735e
Fix issue with functions pointers
pfultz2 Oct 30, 2026
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
2 changes: 2 additions & 0 deletions .selfcheck_suppressions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ autoNoType:test/*.cpp
autoNoType:tools/triage/mainwindow.cpp
# ticket 11631
templateInstantiation:test/testutils.cpp
# the "calculate<T, T>(...)" call in the 1-arg overload cannot be instantiated by the template simplifier
templateInstantiation:lib/calculate.h

naming-varname:externals/simplecpp/simplecpp.h
naming-privateMemberVariable:externals/simplecpp/simplecpp.h
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ $(libcppdir)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/checkers.h li
$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h lib/xml.h
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp

$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/astutils.h lib/checkers.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp

$(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h
Expand Down Expand Up @@ -886,7 +886,7 @@ test/testsarifreport.o: test/testsarifreport.cpp externals/picojson/picojson.h l
test/testsettings.o: test/testsettings.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp

test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
test/testsimplifytemplate.o: test/testsimplifytemplate.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsimplifytemplate.cpp

test/testsimplifytokens.o: test/testsimplifytokens.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
Expand Down Expand Up @@ -928,7 +928,7 @@ test/testthreadexecutor.o: test/testthreadexecutor.cpp cli/executor.h cli/thread
test/testtimer.o: test/testtimer.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/refthunk.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h test/fixture.h test/redirect.h
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtimer.cpp

test/testtoken.o: test/testtoken.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
test/testtoken.o: test/testtoken.cpp lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testtoken.cpp

test/testtokenize.o: test/testtokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/preprocessor.h lib/refthunk.h lib/settings.h lib/smallvector.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
Expand Down
5 changes: 5 additions & 0 deletions cli/cmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
// TODO: bail out when no placeholders are found?
}

// Recreate the symbol database etc. after each template type deduction round
// instead of updating them incrementally - for testing and debugging
else if (std::strcmp(argv[i], "--template-full-rebuild") == 0)
mSettings.templateFullRebuild = true;

else if (std::strncmp(argv[i], "--template-location=", 20) == 0) {
mSettings.templateLocation = argv[i] + 20;
// TODO: bail out when no template is provided?
Expand Down
7 changes: 5 additions & 2 deletions lib/checkio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ CheckIOImpl::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &setti
while (top->astParent() && top->astParent()->str() != "," && top->astParent() != arg->previous())
top = top->astParent();
const ValueType *valuetype = top->argumentType();
if (valuetype && valuetype->type >= ValueType::Type::BOOL) {
if (valuetype && valuetype->isPrimitive()) {
typeToken = tempToken = new Token(top);
if (valuetype->pointer && valuetype->constness & 1) {
tempToken->str("const");
Expand Down Expand Up @@ -1583,7 +1583,10 @@ CheckIOImpl::ArgumentInfo::ArgumentInfo(const Token * arg, const Settings &setti
else if (valuetype->type == ValueType::LONGDOUBLE) {
tempToken->str("double");
tempToken->isLong(true);
}
} else if (valuetype->type == ValueType::FUNCTION)
tempToken->str("function");
else if (valuetype->type == ValueType::MEMBER_POINTER)
tempToken->str("member-pointer");
if (valuetype->isIntegral()) {
if (valuetype->sign == ValueType::Sign::UNSIGNED)
tempToken->isUnsigned(true);
Expand Down
4 changes: 4 additions & 0 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3369,6 +3369,10 @@ bool CheckOtherImpl::testIfNonZeroExpressionIsPositive(const Token *tok, const V
return false;
}

if (const Variable* var = nonZeroExpr->variable())
if (var->typeStartToken()->isTemplateArg())

@dmcppcheck dmcppcheck Oct 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AI review

This bail-out also applies when the variable is declared as a pointer to the template parameter (T* p). That variable is a pointer for every T, so p >= 0 is pointless in generic code too. Base reports pointerPositive for this code, the PR reports nothing, even for an explicit call:

template<class T> bool f(T* p) { return p >= 0; }
bool g(int* q) { return f<int>(q); }
bool h(int* q) { return f(q); }

Consider bailing out only when the pointer or unsigned property comes from T itself, for example by skipping the bail-out when var->isPointer() (the declaration has its own *).

return false;

const ValueType* vt = nonZeroExpr->valueType();
return vt && (vt->pointer || vt->sign == ValueType::UNSIGNED);
}
Expand Down
2 changes: 2 additions & 0 deletions lib/checkunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ static bool isRaiiClass(const ValueType *valueType, bool cpp, bool defaultReturn
case ValueType::Type::SMART_POINTER:
case ValueType::Type::CONTAINER:
case ValueType::Type::ITERATOR:
case ValueType::Type::FUNCTION:
case ValueType::Type::MEMBER_POINTER:
case ValueType::Type::VOID:
case ValueType::Type::BOOL:
case ValueType::Type::CHAR:
Expand Down
5 changes: 5 additions & 0 deletions lib/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,11 @@ class CPPCHECKLIB WARN_UNUSED Settings {
e.g. "{severity} {file}:{line} {message} {id}" */
std::string templateFormat;

/** @brief Is --template-full-rebuild given? Recreate the symbol database etc. from
* scratch after each template type deduction round instead of updating them
* incrementally. For testing and debugging. */
bool templateFullRebuild = false;

/** @brief The output format in which the error locations are printed in
* text mode, e.g. "{file}:{line} {info}" */
std::string templateLocation;
Expand Down
Loading
Loading