eof: Update subassembly link references in parent container #15634
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as resolved.
This comment was marked as resolved.
rodiazet
force-pushed
the
eof-fix-subs-refs
branch
3 times, most recently
from
0b85e3f to
e358c78
Compare
cameel
added
has dependencies
rodiazet
force-pushed
the
eof-fix-subs-refs
branch
from
e358c78 to
7a2ce20
Compare
cameel
previously approved these changes
Dec 11, 2024
Comment on lines
1659
to
+1669
| for (auto i: referencedSubIds) | ||
| ret.bytecode += m_subs[i]->assemble().bytecode; | ||
| { | ||
| size_t const subAssemblyPostionInParentObject = ret.bytecode.size(); | ||
| auto const& subAssemblyLinkerObject = m_subs[i]->assemble(); | ||
| // Append subassembly bytecode to the parent assembly result bytecode | ||
| ret.bytecode += subAssemblyLinkerObject.bytecode; | ||
| // Add subassembly link references to parent linker object. | ||
| // Offset accordingly to subassembly position in parent object bytecode | ||
| for (auto const& [subAssemblyLinkRefPosition, linkRef]: subAssemblyLinkerObject.linkReferences) | ||
| ret.linkReferences[subAssemblyPostionInParentObject + subAssemblyLinkRefPosition] = linkRef; | ||
| } |
Collaborator
There was a problem hiding this comment.
I see that this still does not include the subassembly deduplication we introduced for legacy recently (#13804). I guess we can't do it the same way for EOF anyway since sub-assembly IDs are used as immediate arguments in some opcodes. We'd have to de-duplicate it at a higher level - in Yul or evmasm optimizer.
rodiazet
dismissed
cameel’s stale review
The merge-base changed after approval.
cameel
removed
the
has dependencies
rodiazet
dismissed
cameel’s stale review
The merge-base changed after approval.
rodiazet
force-pushed
the
eof-fix-subs-refs
branch
from
7a2ce20 to
72715f1
Compare
cameel
approved these changes
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #15628. Merged.Depends on #15633. Merged.