Skip to content

Don't use new to allocate StringSet #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eholk wants to merge 1 commit into from
Closed

Don't use new to allocate StringSet #866

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/emscripten-optimizer/istring.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ struct IString {

void set(const char *s, bool reuse=true) {
typedef std::unordered_set<const char *, CStringHash, CStringEqual> StringSet;
static StringSet* strings = new StringSet();
static StringSet strings;

auto existing = strings->find(s);
auto existing = strings.find(s);

if (existing == strings->end()) {
if (existing == strings.end()) {
// the StringSet cache is a global shared structure, which should
// not be modified by multiple threads at once.
assert(!wasm::ThreadPool::isRunning());
Expand All @@ -80,7 +80,7 @@ struct IString {
strncpy(copy, s, len);
s = copy;
}
strings->insert(s);
strings.insert(s);
} else {
s = *existing;
}
Expand Down