void RefSlab::Builder::insert(const SymbolID &ID, const Ref &S) {
auto &M = Refs[ID];
- M.push_back(S);
- M.back().Location.FileURI =
- UniqueStrings.save(M.back().Location.FileURI).data();
+ if (M.count(S))
+ return;
+ Ref R = S;
+ R.Location.FileURI =
+ UniqueStrings.save(R.Location.FileURI).data();
+ M.insert(std::move(R));
}
RefSlab RefSlab::Builder::build() && {
Result.reserve(Refs.size());
size_t NumRefs = 0;
for (auto &Sym : Refs) {
- auto &SymRefs = Sym.second;
- llvm::sort(SymRefs);
- // FIXME: do we really need to dedup?
- SymRefs.erase(std::unique(SymRefs.begin(), SymRefs.end()), SymRefs.end());
-
+ std::vector<Ref> SymRefs(Sym.second.begin(), Sym.second.end());
NumRefs += SymRefs.size();
Result.emplace_back(Sym.first, llvm::ArrayRef<Ref>(SymRefs).copy(Arena));
}
#include "llvm/Support/StringSaver.h"
#include "llvm/Support/raw_ostream.h"
#include <cstdint>
+#include <set>
#include <utility>
namespace clang {
/// Filenames are deduplicated.
class RefSlab {
public:
+ // Refs are stored in order.
using value_type = std::pair<SymbolID, llvm::ArrayRef<Ref>>;
using const_iterator = std::vector<value_type>::const_iterator;
using iterator = const_iterator;
private:
llvm::BumpPtrAllocator Arena;
llvm::UniqueStringSaver UniqueStrings; // Contents on the arena.
- llvm::DenseMap<SymbolID, std::vector<Ref>> Refs;
+ llvm::DenseMap<SymbolID, std::set<Ref>> Refs;
};
private:
[&](RefSlab S) {
std::lock_guard<std::mutex> Lock(SymbolsMu);
for (const auto &Sym : S) {
- // No need to merge as currently all Refs are from main file.
+ // Deduplication happens during insertion.
for (const auto &Ref : Sym.second)
Refs.insert(Sym.first, Ref);
}