kadircet created this revision. kadircet added reviewers: ioeric, sammccall, ilya-biryukov, hokein. Herald added subscribers: cfe-commits, arphaman, jkorous, MaskRay.
Repository: rCTE Clang Tools Extra https://reviews.llvm.org/D54157 Files: clangd/index/FileIndex.cpp unittests/clangd/BackgroundIndexTests.cpp Index: unittests/clangd/BackgroundIndexTests.cpp =================================================================== --- unittests/clangd/BackgroundIndexTests.cpp +++ unittests/clangd/BackgroundIndexTests.cpp @@ -43,7 +43,7 @@ void f_b() { (void)common; })cpp"; - BackgroundIndex Idx(Context::empty(), "", FS, /*URISchmes=*/{"unittest"}); + BackgroundIndex Idx(Context::empty(), "", FS, /*URISchemes=*/{"unittest"}); tooling::CompileCommand Cmd; Cmd.Filename = testPath("root/A.cc"); Index: clangd/index/FileIndex.cpp =================================================================== --- clangd/index/FileIndex.cpp +++ clangd/index/FileIndex.cpp @@ -126,7 +126,7 @@ for (const auto &Sym : *Slab) { auto I = Merged.try_emplace(Sym.ID, Sym); if (!I.second) - I.first->second = mergeSymbol(std::move(I.first->second), Sym); + I.first->second = mergeSymbol(I.first->second, Sym); } } SymsStorage.reserve(Merged.size());
Index: unittests/clangd/BackgroundIndexTests.cpp =================================================================== --- unittests/clangd/BackgroundIndexTests.cpp +++ unittests/clangd/BackgroundIndexTests.cpp @@ -43,7 +43,7 @@ void f_b() { (void)common; })cpp"; - BackgroundIndex Idx(Context::empty(), "", FS, /*URISchmes=*/{"unittest"}); + BackgroundIndex Idx(Context::empty(), "", FS, /*URISchemes=*/{"unittest"}); tooling::CompileCommand Cmd; Cmd.Filename = testPath("root/A.cc"); Index: clangd/index/FileIndex.cpp =================================================================== --- clangd/index/FileIndex.cpp +++ clangd/index/FileIndex.cpp @@ -126,7 +126,7 @@ for (const auto &Sym : *Slab) { auto I = Merged.try_emplace(Sym.ID, Sym); if (!I.second) - I.first->second = mergeSymbol(std::move(I.first->second), Sym); + I.first->second = mergeSymbol(I.first->second, Sym); } } SymsStorage.reserve(Merged.size());
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits