[PATCH] D62839: [clangd] Index API and implementations for relations

[Don Hinton via Phabricator via llvm-commits]

hintonda added a comment.

This seems to have broken gcc 5.4 builds -- for example see http://lab.llvm.org:8011/builders/clang-cmake-armv7-lnt/builds/29/steps/build%20stage%201/logs/stdio.

I believe the following patch should fix the problem:

  diff --git a/clang-tools-extra/clangd/index/FileIndex.cpp b/clang-tools-extra/clangd/index/FileIndex.cpp
  index a90c51b0990..802e4c4a396 100644
  --- a/clang-tools-extra/clangd/index/FileIndex.cpp
  +++ b/clang-tools-extra/clangd/index/FileIndex.cpp
  @@ -72,7 +72,7 @@ static SlabTuple indexSymbols(ASTContext &AST, std::shared_ptr<Preprocessor> PP,
          "  relations slab: {7} relations, {8} bytes",
          FileName, IsIndexMainAST, Syms.size(), Syms.bytes(), Refs.size(),
          Refs.numRefs(), Refs.bytes(), Relations.size(), Relations.bytes());
  -  return {std::move(Syms), std::move(Refs), std::move(Relations)};
  +  return std::make_tuple(std::move(Syms), std::move(Refs), std::move(Relations));
   }
  
   SlabTuple indexMainDecls(ParsedAST &AST) {


Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D62839/new/

https://reviews.llvm.org/D62839