Author: Kadir Cetinkaya Date: 2022-01-19T14:06:53+01:00 New Revision: cae932b6c6d3caedca4ad39d6e1345bcdbc0c863
URL: https://github.com/llvm/llvm-project/commit/cae932b6c6d3caedca4ad39d6e1345bcdbc0c863 DIFF: https://github.com/llvm/llvm-project/commit/cae932b6c6d3caedca4ad39d6e1345bcdbc0c863.diff LOG: [clangd] Sort targets before printing for tests Targets are not necessarily inserted in the order they appear in source code. For example we could traverse overload sets, or selectively insert template patterns after all other decls. So order the targets before printing to make sure tests are not dependent on such implementation details. We can also do it in production, but that might be wasteful as we haven't seen any complaints in the wild around these orderings yet. Differential Revision: https://reviews.llvm.org/D117549 Added: Modified: clang-tools-extra/clangd/FindTarget.cpp clang-tools-extra/clangd/unittests/FindTargetTests.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/FindTarget.cpp b/clang-tools-extra/clangd/FindTarget.cpp index 8b363efc99196..e96aa25fd780c 100644 --- a/clang-tools-extra/clangd/FindTarget.cpp +++ b/clang-tools-extra/clangd/FindTarget.cpp @@ -33,13 +33,16 @@ #include "clang/Basic/LangOptions.h" #include "clang/Basic/OperatorKinds.h" #include "clang/Basic/SourceLocation.h" +#include "clang/Basic/SourceManager.h" #include "clang/Basic/Specifiers.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/Support/Casting.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/raw_ostream.h" #include <iterator> +#include <string> #include <utility> #include <vector> @@ -1169,14 +1172,13 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, DeclRelationSet RS) { llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, ReferenceLoc R) { // note we cannot print R.NameLoc without a source manager. OS << "targets = {"; - bool First = true; + llvm::SmallVector<std::string> Targets; for (const NamedDecl *T : R.Targets) { - if (!First) - OS << ", "; - else - First = false; - OS << printQualifiedName(*T) << printTemplateSpecializationArgs(*T); + llvm::raw_string_ostream Target(Targets.emplace_back()); + Target << printQualifiedName(*T) << printTemplateSpecializationArgs(*T); } + llvm::sort(Targets); + OS << llvm::join(Targets, ", "); OS << "}"; if (R.Qualifier) { OS << ", qualifier = '"; diff --git a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp index 9620db9838ae2..4887ee5b5deb3 100644 --- a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp +++ b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp @@ -1283,11 +1283,7 @@ TEST_F(FindExplicitReferencesTest, All) { "0: targets = {x}, decl\n" "1: targets = {vector}\n" "2: targets = {x}\n"}, -// Handle UnresolvedLookupExpr. -// FIXME -// This case fails when expensive checks are enabled. -// Seems like the order of ns1::func and ns2::func isn't defined. -#ifndef EXPENSIVE_CHECKS + // Handle UnresolvedLookupExpr. {R"cpp( namespace ns1 { void func(char*); } namespace ns2 { void func(int*); } @@ -1301,7 +1297,6 @@ TEST_F(FindExplicitReferencesTest, All) { )cpp", "0: targets = {ns1::func, ns2::func}\n" "1: targets = {t}\n"}, -#endif // Handle UnresolvedMemberExpr. {R"cpp( struct X { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
