Skip to content

eof: Enable jumpdest remover optimiser for EOF. #15992

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

eof: Enable jumpdest remover optimiser for EOF. #15992

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
4 changes: 2 additions & 2 deletions libevmasm/Assembly.cpp
View file
Original file line number Diff line number Diff line change
@@ -832,8 +832,8 @@ std::map<u256, u256> const& Assembly::optimiseInternal(
m_evmVersion
}.optimise();
}
// TODO: verify this for EOF.
if (_settings.runJumpdestRemover && !m_eofVersion.has_value())

if (_settings.runJumpdestRemover)
{
for (auto& codeSection: m_codeSections)
{
6 changes: 1 addition & 5 deletions test/libyul/objectCompiler/eof/functions.yul
View file
Original file line number Diff line number Diff line change
@@ -42,8 +42,6 @@ object "a" {
// calldataload
// /* "source":91:128 */
// rjumpi{tag_1}
// /* "source":22:386 */
// tag_2:
// /* "source":151:153 */
// 0x20
// /* "source":148:149 */
@@ -58,8 +56,6 @@ object "a" {
// code_section_1: assembly {
// /* "source":217:294 */
// rjumpi{tag_3}
// /* "source":203:324 */
// tag_4:
// /* "source":312:314 */
// 0x63
// /* "source":173:324 */
@@ -81,4 +77,4 @@ object "a" {
// }
// Bytecode: ef000101000c020003001400090003040000000080000201010001008000025f35e300015f52602035e1000460205ff3e50002e100036063e46005e45f80fd
// Opcodes: 0xEF STOP ADD ADD STOP 0xC MUL STOP SUB STOP EQ STOP MULMOD STOP SUB DIV STOP STOP STOP STOP DUP1 STOP MUL ADD ADD STOP ADD STOP DUP1 STOP MUL PUSH0 CALLDATALOAD CALLF 0x1 PUSH0 MSTORE PUSH1 0x20 CALLDATALOAD RJUMPI 0x4 PUSH1 0x20 PUSH0 RETURN JUMPF 0x2 RJUMPI 0x3 PUSH1 0x63 RETF PUSH1 0x5 RETF PUSH0 DUP1 REVERT
// SourceMappings: 74:1:0:-:0;61:15;56:21::i;53:1::-;46:32;107:2;94:16;91:37;22:364;151:2;148:1;141:13;111:17;113:13::i217:77:0:-:0;203:121;312:2;173:151::o;234:60::-;257:1;275:5::o376:1:0:-:0;366:12;
// SourceMappings: 74:1:0:-:0;61:15;56:21::i;53:1::-;46:32;107:2;94:16;91:37;151:2;148:1;141:13;111:17;113:13::i217:77:0:-:0;312:2;173:151::o;234:60::-;257:1;275:5::o376:1:0:-:0;366:12;
6 changes: 0 additions & 6 deletions test/libyul/objectCompiler/eof/verbatim_bug.yul
View file
Original file line number Diff line number Diff line change
@@ -44,26 +44,20 @@ object "a" {
// /* "source":133:225 */
// eq
// rjumpi{tag_1}
// /* "source":108:406 */
// tag_2:
// /* "source":238:263 */
// dup1
// /* "source":243:247 */
// 0x01
// /* "source":238:263 */
// eq
// rjumpi{tag_3}
// /* "source":108:406 */
// tag_4:
// /* "source":276:368 */
// dup1
// /* "source":281:285 */
// 0x02
// /* "source":276:368 */
// eq
// rjumpi{tag_5}
// /* "source":108:406 */
// tag_6:
// /* "source":386:390 */
// 0x03
// /* "source":381:406 */