cerc-io/solidity
11
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

Prevent instructions to be generated as names.

Browse Source
This commit is contained in:
chriseth
2019-04-24 14:35:21 +02:00
parent eac0048176
commit 0af8d758a5
6 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/optimiser/VarNameCleaner.cpp
+8 -2
View File
@@ -18,6 +18,8 @@
#include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/AsmData.h>
#include <libyul/Dialect.h>
#include <libyul/AsmParser.h>
#include <libyul/backends/evm/EVMDialect.h>
#include <algorithm>
#include <cctype>
#include <climits>
@@ -93,7 +95,7 @@ void VarNameCleaner::operator()(Identifier& _identifier)
YulString VarNameCleaner::findCleanName(YulString const& _name) const
{
auto newName = stripSuffix(_name);
if (newName != YulString{} && !isUsedName(newName))
if (!isUsedName(newName))
return newName;
// create new name with suffix (by finding a free identifier)
@@ -108,7 +110,11 @@ YulString VarNameCleaner::findCleanName(YulString const& _name) const
bool VarNameCleaner::isUsedName(YulString const& _name) const
{
return m_dialect.builtin(_name) || m_usedNames.count(_name);
if (_name.empty() || m_dialect.builtin(_name) || m_usedNames.count(_name))
return true;
if (dynamic_cast<EVMDialect const*>(&m_dialect))
return Parser::instructions().count(_name.str());
return false;
}
YulString VarNameCleaner::stripSuffix(YulString const& _name) const