diff --git a/clang-tools-extra/clangd/IncludeCleaner.cpp b/clang-tools-extra/clangd/IncludeCleaner.cpp --- a/clang-tools-extra/clangd/IncludeCleaner.cpp +++ b/clang-tools-extra/clangd/IncludeCleaner.cpp @@ -13,6 +13,7 @@ #include "SourceCode.h" #include "support/Logger.h" #include "support/Trace.h" +#include "clang/AST/ExprCXX.h" #include "clang/AST/RecursiveASTVisitor.h" #include "clang/Basic/SourceLocation.h" #include "clang/Lex/HeaderSearch.h" @@ -104,6 +105,13 @@ return true; } + // When the overload is not resolved yet, mark all candidates as used. + bool VisitOverloadExpr(OverloadExpr *E) { + for (const auto *ResolutionDecl : E->decls()) + add(ResolutionDecl); + return true; + } + private: using Base = RecursiveASTVisitor; diff --git a/clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp b/clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp --- a/clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp +++ b/clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp @@ -97,6 +97,10 @@ "inline void ^foo() {}", "void bar() { foo(); }", }, + { + "int ^foo(char); int ^foo(float);", + "template int x = foo(T{});", + }, // Static function { "struct ^X { static bool ^foo(); }; bool X::^foo() {}",