Author: Kirill Bobyrev Date: 2021-07-21T14:51:16+02:00 New Revision: 907efdf95da567c314e2c9b9df67187756eed5ca
URL: https://github.com/llvm/llvm-project/commit/907efdf95da567c314e2c9b9df67187756eed5ca DIFF: https://github.com/llvm/llvm-project/commit/907efdf95da567c314e2c9b9df67187756eed5ca.diff LOG: [clangd] Cleanup FuzzyFindRequest serialization and dex benchmark * Due to the LLVM's JSON library changes (?), FuzzyFindRequest serialization is no longer valid since arrays are serialized as llvm::json::Array already. Hence, current implementation creates a nested array. * YAML format is no longer the default, mention this for the benchmark. * FIXME is no longer relevant. I ran benchmarks that showed no improvement with priority_queue years ago. Reviewed By: sammccall Differential Revision: https://reviews.llvm.org/D106432 Added: Modified: clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp clang-tools-extra/clangd/index/Index.cpp clang-tools-extra/clangd/index/dex/Iterator.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp b/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp index deeb07b4cb648..68bd8d02b0b47 100644 --- a/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp +++ b/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp @@ -106,7 +106,7 @@ BENCHMARK(DexBuild); int main(int argc, char *argv[]) { if (argc < 3) { llvm::errs() << "Usage: " << argv[0] - << " global-symbol-index.yaml requests.json " + << " global-symbol-index.dex requests.json " "BENCHMARK_OPTIONS...\n"; return -1; } diff --git a/clang-tools-extra/clangd/index/Index.cpp b/clang-tools-extra/clangd/index/Index.cpp index dbb42bafa1f84..12f4ff9b82c4a 100644 --- a/clang-tools-extra/clangd/index/Index.cpp +++ b/clang-tools-extra/clangd/index/Index.cpp @@ -49,12 +49,12 @@ bool fromJSON(const llvm::json::Value &Parameters, FuzzyFindRequest &Request, llvm::json::Value toJSON(const FuzzyFindRequest &Request) { return llvm::json::Object{ {"Query", Request.Query}, - {"Scopes", llvm::json::Array{Request.Scopes}}, + {"Scopes", Request.Scopes}, {"AnyScope", Request.AnyScope}, {"Limit", Request.Limit}, {"RestrictForCodeCompletion", Request.RestrictForCodeCompletion}, - {"ProximityPaths", llvm::json::Array{Request.ProximityPaths}}, - {"PreferredTypes", llvm::json::Array{Request.PreferredTypes}}, + {"ProximityPaths", Request.ProximityPaths}, + {"PreferredTypes", Request.PreferredTypes}, }; } diff --git a/clang-tools-extra/clangd/index/dex/Iterator.cpp b/clang-tools-extra/clangd/index/dex/Iterator.cpp index abe3556098fb1..77e8175ca4b66 100644 --- a/clang-tools-extra/clangd/index/dex/Iterator.cpp +++ b/clang-tools-extra/clangd/index/dex/Iterator.cpp @@ -207,7 +207,6 @@ class OrIterator : public Iterator { return OS; } - // FIXME(kbobyrev): Would storing Children in min-heap be faster? std::vector<std::unique_ptr<Iterator>> Children; friend Corpus; // For optimizations. }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
