maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Temporarily Revert "[Support] Make UniqueStringSaver wrap a StringSet" 

as it's causing asan failures in clangd. Followed up offline
with repro instructions.

This reverts commit 29560a89dd.
This commit is contained in:
Eric Christopher 2020-05-14 19:16:45 -07:00
parent 85725a67c7
commit dad2e92eaf
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
llvm/include/llvm/Support/StringSaver.h
View File

@ -9,7 +9,7 @@
#ifndef LLVM_SUPPORT_STRINGSAVER_H #ifndef LLVM_SUPPORT_STRINGSAVER_H
#define LLVM_SUPPORT_STRINGSAVER_H #define LLVM_SUPPORT_STRINGSAVER_H
#include "llvm/ADT/StringSet.h" #include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "llvm/ADT/Twine.h" #include "llvm/ADT/Twine.h"
#include "llvm/Support/Allocator.h" #include "llvm/Support/Allocator.h"
@ -36,8 +36,12 @@ public:
/// ///
/// Compared to StringSaver, it does more work but avoids saving the same string /// Compared to StringSaver, it does more work but avoids saving the same string
/// multiple times. /// multiple times.
///
/// Compared to StringPool, it performs fewer allocations but doesn't support
/// refcounting/deletion.
class UniqueStringSaver final { class UniqueStringSaver final {
StringSet<BumpPtrAllocator &> Strings; StringSaver Strings;
llvm::DenseSet<llvm::StringRef> Unique;
public: public:
UniqueStringSaver(BumpPtrAllocator &Alloc) : Strings(Alloc) {} UniqueStringSaver(BumpPtrAllocator &Alloc) : Strings(Alloc) {}

5
llvm/lib/Support/StringSaver.cpp
View File

@ -19,5 +19,8 @@ StringRef StringSaver::save(StringRef S) {
} }
StringRef UniqueStringSaver::save(StringRef S) { StringRef UniqueStringSaver::save(StringRef S) {
return Strings.insert(S).first->getKey(); auto R = Unique.insert(S);
if (R.second) // cache miss, need to actually save the string
*R.first = Strings.save(S); // safe replacement with equal value
return *R.first;
} }