Use ArrayRef::copy, instead of copying data manually

gribozavr · gribozavr · commit 7344188b72b7 · 2019-02-28T14:00:26.000Z
Reviewers: ioeric Subscribers: jkorous, arphaman, kadircet, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D58782 llvm-svn: 355091
diff --git a/clang-tools-extra/clangd/index/Ref.cpp b/clang-tools-extra/clangd/index/Ref.cpp
@@ -51,9 +51,7 @@ RefSlab RefSlab::Builder::build() && {
     SymRefs.erase(std::unique(SymRefs.begin(), SymRefs.end()), SymRefs.end());
 
     NumRefs += SymRefs.size();
-    auto *Array = Arena.Allocate<Ref>(SymRefs.size());
-    std::uninitialized_copy(SymRefs.begin(), SymRefs.end(), Array);
-    Result.emplace_back(Sym.first, llvm::ArrayRef<Ref>(Array, SymRefs.size()));
+    Result.emplace_back(Sym.first, llvm::ArrayRef<Ref>(SymRefs).copy(Arena));
   }
   return RefSlab(std::move(Result), std::move(Arena), NumRefs);
 }

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,7 @@ RefSlab RefSlab::Builder::build() && {`
`51`	`51`	`SymRefs.erase(std::unique(SymRefs.begin(), SymRefs.end()), SymRefs.end());`
`52`	`52`
`53`	`53`	`NumRefs += SymRefs.size();`
`54`		`- auto *Array = Arena.Allocate<Ref>(SymRefs.size());`
`55`		`- std::uninitialized_copy(SymRefs.begin(), SymRefs.end(), Array);`
`56`		`- Result.emplace_back(Sym.first, llvm::ArrayRef<Ref>(Array, SymRefs.size()));`
	`54`	`+ Result.emplace_back(Sym.first, llvm::ArrayRef<Ref>(SymRefs).copy(Arena));`
`57`	`55`	`}`
`58`	`56`	`return RefSlab(std::move(Result), std::move(Arena), NumRefs);`
`59`	`57`	`}`