diff --git a/clang-tools-extra/clangd/FindTarget.cpp b/clang-tools-extra/clangd/FindTarget.cpp --- a/clang-tools-extra/clangd/FindTarget.cpp +++ b/clang-tools-extra/clangd/FindTarget.cpp @@ -714,10 +714,12 @@ for (const DesignatedInitExpr::Designator &D : DIE->designators()) { if (!D.isFieldDesignator()) continue; - Refs.push_back(ReferenceLoc{NestedNameSpecifierLoc(), - D.getFieldLoc(), - /*IsDecl=*/false, - {D.getField()}}); + + llvm::SmallVector Targets; + if (D.getField()) + Targets.push_back(D.getField()); + Refs.push_back(ReferenceLoc{NestedNameSpecifierLoc(), D.getFieldLoc(), + /*IsDecl=*/false, std::move(Targets)}); } } }; diff --git a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp --- a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp +++ b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp @@ -1273,7 +1273,20 @@ "5: targets = {Bar}\n" "6: targets = {bar}, decl\n" "7: targets = {foo()::Bar::Foo}\n" - "8: targets = {foo()::Baz::Field}\n"}}; + "8: targets = {foo()::Baz::Field}\n"}, + {R"cpp( + template + void crash(T); + template + void foo() { + $0^crash({.$1^x = $2^T()}); + } + )cpp", + "0: targets = {crash}\n" + "1: targets = {}\n" + "2: targets = {T}\n" + }, + }; for (const auto &C : Cases) { llvm::StringRef ExpectedCode = C.first;