[PATCH] D42113: [clangd] Deduplicate symbols collected in global-symbol-builder tool.

[Eric Liu via Phabricator via cfe-commits]

ioeric updated this revision to Diff 130207.
ioeric marked 3 inline comments as done.
ioeric added a comment.

Addressed review comments.


Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D42113

Files:
  clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp


Index: clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp
===================================================================
--- clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp
+++ clangd/global-symbol-builder/GlobalSymbolBuilderMain.cpp
@@ -105,7 +105,22 @@
     llvm::errs() << llvm::toString(std::move(Err)) << "\n";
   }
 
+  // Deduplicate the result by key and keep the longest value.
+  // FIXME(ioeric): Merge occurrences, rather than just dropping all but one.
+  // Definitions and forward declarations have the same key and may both have
+  // information. Usage count will need to be aggregated across occurrences,
+  // too.
+  llvm::StringMap<llvm::StringRef> UniqueSymbols;
   Executor->get()->getToolResults()->forEachResult(
-      [](llvm::StringRef, llvm::StringRef Value) { llvm::outs() << Value; });
+      [&UniqueSymbols](llvm::StringRef Key, llvm::StringRef Value) {
+        auto Ret = UniqueSymbols.try_emplace(Key, Value);
+        if (!Ret.second) {
+          // If key already exists, keep the longest value.
+          llvm::StringRef &V = Ret.first->second;
+          V = V.size() < Value.size() ? Value : V;
+        }
+      });
+  for (const auto &Sym : UniqueSymbols)
+    llvm::outs() << Sym.second;
   return 0;
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D42113.130207.patch
Type: text/x-patch
Size: 1270 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180117/bbe4e838/attachment.bin>