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

Explicitly check for jump instructions in EVMDialect

Browse Source
This commit is contained in:
Alex Beregszaszi 2020-07-03 18:01:07 +01:00
parent f0d256bfdb
commit 55e41b602a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libyul/backends/evm/EVMDialect.cpp
View File

@ -114,12 +114,15 @@ pair<YulString, BuiltinFunctionForEVM> createFunction(
map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess) map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
{ {
map<YulString, BuiltinFunctionForEVM> builtins; map<YulString, BuiltinFunctionForEVM> builtins;
// NOTE: Parser::instructions() will filter JUMPDEST and PUSHnn too
for (auto const& instr: Parser::instructions()) for (auto const& instr: Parser::instructions())
if ( if (
!evmasm::isDupInstruction(instr.second) && !evmasm::isDupInstruction(instr.second) &&
!evmasm::isSwapInstruction(instr.second) && !evmasm::isSwapInstruction(instr.second) &&
!evmasm::isPushInstruction(instr.second) &&
instr.second != evmasm::Instruction::JUMP && instr.second != evmasm::Instruction::JUMP &&
instr.second != evmasm::Instruction::JUMPI && instr.second != evmasm::Instruction::JUMPI &&
instr.second != evmasm::Instruction::JUMPDEST &&
_evmVersion.hasOpcode(instr.second) _evmVersion.hasOpcode(instr.second)
) )
builtins.emplace(createEVMFunction(instr.first, instr.second)); builtins.emplace(createEVMFunction(instr.first, instr.second));