From 40749141030b8172b8490ebbdcd0d3440cbe041b Mon Sep 17 00:00:00 2001 From: Kadir Cetinkaya Date: Mon, 19 Oct 2020 12:33:35 +0200 Subject: [PATCH] [clangd] Rename edge name for filesymbols to slabs in memorytree This was causing duplicate `symbols` components on the path as both the edge from an index to filesymbols and filesymbols to symbolslabs were named symbols. Differential Revision: https://reviews.llvm.org/D89685 --- clang-tools-extra/clangd/index/Background.cpp | 2 +- clang-tools-extra/clangd/index/FileIndex.cpp | 4 ++-- clang-tools-extra/clangd/test/memory_tree.test | 4 ++-- clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp | 2 +- clang-tools-extra/clangd/unittests/FileIndexTests.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp index 4779cb8..1649bff 100644 --- a/clang-tools-extra/clangd/index/Background.cpp +++ b/clang-tools-extra/clangd/index/Background.cpp @@ -416,7 +416,7 @@ BackgroundIndex::loadProject(std::vector MainFiles) { } void BackgroundIndex::profile(MemoryTree &MT) const { - IndexedSymbols.profile(MT.child("symbols")); + IndexedSymbols.profile(MT.child("slabs")); // We don't want to mix memory used by index and symbols, so call base class. MT.child("index").addUsage(SwapIndex::estimateMemoryUsage()); } diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp index 587c7eb..9a376df 100644 --- a/clang-tools-extra/clangd/index/FileIndex.cpp +++ b/clang-tools-extra/clangd/index/FileIndex.cpp @@ -478,11 +478,11 @@ void FileIndex::updateMain(PathRef Path, ParsedAST &AST) { } void FileIndex::profile(MemoryTree &MT) const { - PreambleSymbols.profile(MT.child("preamble").child("symbols")); + PreambleSymbols.profile(MT.child("preamble").child("slabs")); MT.child("preamble") .child("index") .addUsage(PreambleIndex.estimateMemoryUsage()); - MainFileSymbols.profile(MT.child("main_file").child("symbols")); + MainFileSymbols.profile(MT.child("main_file").child("slabs")); MT.child("main_file") .child("index") .addUsage(MainFileIndex.estimateMemoryUsage()); diff --git a/clang-tools-extra/clangd/test/memory_tree.test b/clang-tools-extra/clangd/test/memory_tree.test index 41efdfb..c0a6aaf 100644 --- a/clang-tools-extra/clangd/test/memory_tree.test +++ b/clang-tools-extra/clangd/test/memory_tree.test @@ -22,7 +22,7 @@ # CHECK-NEXT: "_self": {{[0-9]+}}, # CHECK-NEXT: "_total": {{[0-9]+}} # CHECK-NEXT: }, -# CHECK-NEXT: "symbols": { +# CHECK-NEXT: "slabs": { # CHECK-NEXT: "{{.*}}main.cpp": { # CHECK-NEXT: "_self": {{[0-9]+}}, # CHECK-NEXT: "_total": {{[0-9]+}}, @@ -50,7 +50,7 @@ # CHECK-NEXT: "_self": {{[0-9]+}}, # CHECK-NEXT: "_total": {{[0-9]+}} # CHECK-NEXT: }, -# CHECK-NEXT: "symbols": { +# CHECK-NEXT: "slabs": { # CHECK-NEXT: "_self": {{[0-9]+}}, # CHECK-NEXT: "_total": {{[0-9]+}} # CHECK-NEXT: } diff --git a/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp index 4f08951..cc0ca6f 100644 --- a/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp +++ b/clang-tools-extra/clangd/unittests/BackgroundIndexTests.cpp @@ -927,7 +927,7 @@ TEST(BackgroundIndex, Profile) { MemoryTree MT(&Alloc); Idx.profile(MT); ASSERT_THAT(MT.children(), - UnorderedElementsAre(Pair("symbols", _), Pair("index", _))); + UnorderedElementsAre(Pair("slabs", _), Pair("index", _))); } } // namespace clangd diff --git a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp index 2b20b7e..4abe0bf 100644 --- a/clang-tools-extra/clangd/unittests/FileIndexTests.cpp +++ b/clang-tools-extra/clangd/unittests/FileIndexTests.cpp @@ -672,9 +672,9 @@ TEST(FileIndexTest, Profile) { UnorderedElementsAre(Pair("preamble", _), Pair("main_file", _))); ASSERT_THAT(MT.child("preamble").children(), - UnorderedElementsAre(Pair("index", _), Pair("symbols", _))); + UnorderedElementsAre(Pair("index", _), Pair("slabs", _))); ASSERT_THAT(MT.child("main_file").children(), - UnorderedElementsAre(Pair("index", _), Pair("symbols", _))); + UnorderedElementsAre(Pair("index", _), Pair("slabs", _))); ASSERT_THAT(MT.child("preamble").child("index").total(), Gt(0U)); ASSERT_THAT(MT.child("main_file").child("index").total(), Gt(0U)); -- 2.7.4