Skip to content

Performance: Remove unnecessary dereferencing from YulString storage #16763

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

Open
DanielVF wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Performance: Remove unnecessary dereferencing from YulString storage #16763

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
11 changes: 6 additions & 5 deletions libyul/YulString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@

#include <fmt/format.h>

#include <unordered_map>
#include <deque>
#include <memory>
#include <unordered_map>
#include <vector>
#include <string>
#include <string_view>
Expand Down Expand Up @@ -59,15 +60,15 @@ class YulStringRepository
std::uint64_t h = hash(_string);
auto range = m_hashToID.equal_range(h);
for (auto it = range.first; it != range.second; ++it)
if (*m_strings[it->second] == _string)
if (m_strings[it->second] == _string)
return Handle{it->second, h};
m_strings.emplace_back(std::make_shared<std::string>(_string));
m_strings.emplace_back(_string);
size_t id = m_strings.size() - 1;
m_hashToID.emplace_hint(range.second, std::make_pair(h, id));

return Handle{id, h};
}
std::string const& idToString(size_t _id) const { return *m_strings.at(_id); }
std::string const& idToString(size_t _id) const { return m_strings.at(_id); }

static std::uint64_t hash(std::string_view const v)
{
Expand Down Expand Up @@ -115,7 +116,7 @@ class YulStringRepository
return callbacks;
}

std::vector<std::shared_ptr<std::string>> m_strings = {std::make_shared<std::string>()};
std::deque<std::string> m_strings = {""};
std::unordered_multimap<std::uint64_t, size_t> m_hashToID = {{emptyHash(), 0}};
};

Expand Down