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 #3005 from ethereum/lll-instruction

Browse Source 
lll: do not expose push/dup/swap/jumpdest as functions
This commit is contained in:
Alex Beregszaszi 2017-10-02 20:47:31 +01:00 committed by GitHub
commit 91b20b4bd2
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
liblll/CodeFragment.cpp
View File

@ -113,6 +113,22 @@ CodeFragment::CodeFragment(sp::utree const& _t, CompilerState& _s, bool _allowAS
} }
} }
namespace
{
/// Returns true iff the instruction is valid as a function.
bool validFunctionalInstruction(string us)
{
auto it = c_instructions.find(us);
return !(
it == c_instructions.end() ||
solidity::isPushInstruction(it->second) ||
solidity::isDupInstruction(it->second) ||
solidity::isSwapInstruction(it->second) ||
it->second == solidity::Instruction::JUMPDEST
);
}
}
void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s) void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
{ {
if (_t.tag() == 0 && _t.empty()) if (_t.tag() == 0 && _t.empty())
@ -409,7 +425,7 @@ void CodeFragment::constructOperation(sp::utree const& _t, CompilerState& _s)
for (auto const& i: cs.macros) for (auto const& i: cs.macros)
_s.macros.insert(i); _s.macros.insert(i);
} }
else if (c_instructions.count(us)) else if (c_instructions.count(us) && validFunctionalInstruction(us))
{ {
auto it = c_instructions.find(us); auto it = c_instructions.find(us);
requireSize(instructionInfo(it->second).args); requireSize(instructionInfo(it->second).args);