-
Notifications
You must be signed in to change notification settings - Fork 6.1k
Fix ast-id-only IR debug info output #16734
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.
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
LeviofCrypto
wants to merge
1
commit into
argotorg:develop
Choose a base branch
from
LeviofCrypto:fix-ast-id-only-ir-debug-info
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
1 change: 1 addition & 0 deletions
1
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_ast_id_only/args
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| --allow-paths . |
6 changes: 6 additions & 0 deletions
6
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_ast_id_only/in.sol
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| pragma solidity >=0.0; | ||
|
|
||
| contract C { | ||
| function f() public {} | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| } | ||
13 changes: 13 additions & 0 deletions
13
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_ast_id_only/input.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "language": "Solidity", | ||
| "sources": { | ||
| "C": {"urls": ["in.sol"]} | ||
| }, | ||
| "settings": { | ||
| "debug": {"debugInfo": ["ast-id"]}, | ||
| "optimizer": {"enabled": true}, | ||
| "outputSelection": { | ||
| "*": {"*": ["ir", "irOptimized", "evm.assembly"]} | ||
| } | ||
| } | ||
| } |
199 changes: 199 additions & 0 deletions
199
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_ast_id_only/output.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| { | ||
| "contracts": { | ||
| "C": { | ||
| "C": { | ||
| "evm": { | ||
| "assembly": " mstore(0x40, 0x80) | ||
| callvalue | ||
| dup1 | ||
| iszero | ||
| tag_1 | ||
| jumpi | ||
| revert(0x00, 0x00) | ||
| tag_1: | ||
| pop | ||
| dataSize(sub_0) | ||
| dup1 | ||
| dataOffset(sub_0) | ||
| 0x00 | ||
| codecopy | ||
| 0x00 | ||
| return | ||
| stop | ||
|
|
||
| sub_0: assembly { | ||
| mstore(0x40, 0x80) | ||
| callvalue | ||
| dup1 | ||
| iszero | ||
| tag_1 | ||
| jumpi | ||
| revert(0x00, 0x00) | ||
| tag_1: | ||
| pop | ||
| jumpi(tag_2, lt(calldatasize, 0x04)) | ||
| shr(0xe0, calldataload(0x00)) | ||
| dup1 | ||
| 0x26121ff0 | ||
| eq | ||
| tag_3 | ||
| jumpi | ||
| tag_2: | ||
| revert(0x00, 0x00) | ||
| tag_3: | ||
| stop | ||
|
|
||
| auxdata: <AUXDATA REMOVED> | ||
| } | ||
| " | ||
| }, | ||
| "ir": " | ||
| /// @use-src 0:\"C\" | ||
| object \"C_6\" { | ||
| code { | ||
|
|
||
| mstore(64, memoryguard(128)) | ||
| if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } | ||
|
|
||
| constructor_C_6() | ||
|
|
||
| let _1 := allocate_unbounded() | ||
| codecopy(_1, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\")) | ||
|
|
||
| return(_1, datasize(\"C_6_deployed\")) | ||
|
|
||
| function allocate_unbounded() -> memPtr { | ||
| memPtr := mload(64) | ||
| } | ||
|
|
||
| function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() { | ||
| revert(0, 0) | ||
| } | ||
|
|
||
| function constructor_C_6() { | ||
|
|
||
| } | ||
|
|
||
| } | ||
| /// @use-src 0:\"C\" | ||
| object \"C_6_deployed\" { | ||
| code { | ||
|
|
||
| mstore(64, memoryguard(128)) | ||
|
|
||
| if iszero(lt(calldatasize(), 4)) | ||
| { | ||
| let selector := shift_right_224_unsigned(calldataload(0)) | ||
| switch selector | ||
|
|
||
| case 0x26121ff0 | ||
| { | ||
| // f() | ||
|
|
||
| external_fun_f_5() | ||
| } | ||
|
|
||
| default {} | ||
| } | ||
|
|
||
| revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() | ||
|
|
||
| function shift_right_224_unsigned(value) -> newValue { | ||
| newValue := | ||
|
|
||
| shr(224, value) | ||
|
|
||
| } | ||
|
|
||
| function allocate_unbounded() -> memPtr { | ||
| memPtr := mload(64) | ||
| } | ||
|
|
||
| function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() { | ||
| revert(0, 0) | ||
| } | ||
|
|
||
| function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() { | ||
| revert(0, 0) | ||
| } | ||
|
|
||
| function abi_decode_tuple_(headStart, dataEnd) { | ||
| if slt(sub(dataEnd, headStart), 0) { revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b() } | ||
|
|
||
| } | ||
|
|
||
| function abi_encode_tuple__to__fromStack(headStart ) -> tail { | ||
| tail := add(headStart, 0) | ||
|
|
||
| } | ||
|
|
||
| function external_fun_f_5() { | ||
|
|
||
| if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() } | ||
| abi_decode_tuple_(4, calldatasize()) | ||
| fun_f_5() | ||
| let memPos := allocate_unbounded() | ||
| let memEnd := abi_encode_tuple__to__fromStack(memPos ) | ||
| return(memPos, sub(memEnd, memPos)) | ||
|
|
||
| } | ||
|
|
||
| function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() { | ||
| revert(0, 0) | ||
| } | ||
|
|
||
| /// @ast-id 5 | ||
|
|
||
| function fun_f_5() { | ||
|
|
||
| } | ||
|
|
||
| } | ||
|
|
||
| data \".metadata\" hex\"<BYTECODE REMOVED>\" | ||
| } | ||
|
|
||
| } | ||
|
|
||
| ", | ||
| "irOptimized": "/// @use-src 0:\"C\" | ||
| object \"C_6\" { | ||
| code { | ||
| { | ||
| let _1 := memoryguard(0x80) | ||
| mstore(64, _1) | ||
| if callvalue() { revert(0, 0) } | ||
| let _2 := datasize(\"C_6_deployed\") | ||
| codecopy(_1, dataoffset(\"C_6_deployed\"), _2) | ||
| return(_1, _2) | ||
| } | ||
| } | ||
| /// @use-src 0:\"C\" | ||
| object \"C_6_deployed\" { | ||
| code { | ||
| { | ||
| if iszero(lt(calldatasize(), 4)) | ||
| { | ||
| if eq(0x26121ff0, shr(224, calldataload(0))) | ||
| { | ||
| if callvalue() { revert(0, 0) } | ||
| if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) } | ||
| return(0, 0) | ||
| } | ||
| } | ||
| revert(0, 0) | ||
| } | ||
| } | ||
| data \".metadata\" hex\"<BYTECODE REMOVED>\" | ||
| } | ||
| } | ||
| " | ||
| } | ||
| } | ||
| }, | ||
| "sources": { | ||
| "C": { | ||
| "id": 0 | ||
| } | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR also needs a Changelog entry.