cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5377 from ethereum/resetYulString

Browse Source 
Reset yul string repository.
This commit is contained in:
chriseth 2018-11-09 16:06:51 +01:00 committed by GitHub
commit dffbeebf60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/interface/CompilerStack.cpp
View File

@ -47,6 +47,8 @@
#include <libevmasm/Exceptions.h> #include <libevmasm/Exceptions.h>
#include <libyul/YulString.h>
#include <libdevcore/SwarmHash.h> #include <libdevcore/SwarmHash.h>
#include <libdevcore/JSON.h> #include <libdevcore/JSON.h>
@ -104,6 +106,7 @@ void CompilerStack::reset(bool _keepSources)
m_stackState = Empty; m_stackState = Empty;
m_sources.clear(); m_sources.clear();
} }
yul::YulStringRepository::instance().reset();
m_libraries.clear(); m_libraries.clear();
m_evmVersion = EVMVersion(); m_evmVersion = EVMVersion();
m_optimize = false; m_optimize = false;

12
libyul/YulString.h
View File

@ -35,9 +35,9 @@ namespace yul
class YulStringRepository: boost::noncopyable class YulStringRepository: boost::noncopyable
{ {
public: public:
YulStringRepository(): m_strings{std::make_shared<std::string>()} YulStringRepository()
{ {
m_ids[std::string{}] = 0; reset();
} }
static YulStringRepository& instance() static YulStringRepository& instance()
{ {
@ -61,6 +61,14 @@ public:
return *m_strings.at(_id); return *m_strings.at(_id);
} }
void reset()
{
m_strings.clear();
m_ids.clear();
m_strings.emplace_back(std::make_shared<std::string>());
m_ids[std::string{}] = 0;
}
private: private:
std::vector<std::shared_ptr<std::string>> m_strings; std::vector<std::shared_ptr<std::string>> m_strings;
std::map<std::string, size_t> m_ids; std::map<std::string, size_t> m_ids;

2
test/libyul/YulOptimizerTest.cpp
View File

@ -90,6 +90,8 @@ YulOptimizerTest::YulOptimizerTest(string const& _filename)
bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted) bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
{ {
yul::YulStringRepository::instance().reset();
assembly::AsmPrinter printer{m_yul}; assembly::AsmPrinter printer{m_yul};
shared_ptr<Block> ast; shared_ptr<Block> ast;
shared_ptr<assembly::AsmAnalysisInfo> analysisInfo; shared_ptr<assembly::AsmAnalysisInfo> analysisInfo;