Do not use named function labels if function names are not unique. #12139
Conversation
chriseth
force-pushed
the
nonamedlabelsifnotunique
branch
from
8ae7765 to
f0c9a0d
Compare
| @@ -0,0 +1 @@ | |||
| --strict-assembly No newline at end of file | |||
There was a problem hiding this comment.
I don't think the annotations add much in this particular test. Might actually be more readable without them. Maybe it would be better to disable them?
| --strict-assembly | |
| --strict-assembly --debug-info none |
|
Does this PR fix also a similar case I found in inline assembly #12090 (comment)? EDIT: Reported as a separate issue (#12158). |
| @@ -0,0 +1 @@ | |||
| --experimental-via-ir --combined-json function-debug-runtime | |||
There was a problem hiding this comment.
Output would be more readable if it was not all on a single line:
| --experimental-via-ir --combined-json function-debug-runtime | |
| --experimental-via-ir --combined-json function-debug-runtime --pretty-json --json-indent 4 |
| contract C { | ||
| function f() public pure returns (uint r) { | ||
| assembly { function f() -> x { x := 1 } r := f() } | ||
| } | ||
| function g() public pure returns (uint r) { | ||
| assembly { function f() -> x { x := 2 } r := f() } | ||
| } | ||
| } |
There was a problem hiding this comment.
| contract C { | |
| function f() public pure returns (uint r) { | |
| assembly { function f() -> x { x := 1 } r := f() } | |
| } | |
| function g() public pure returns (uint r) { | |
| assembly { function f() -> x { x := 2 } r := f() } | |
| } | |
| } | |
| contract C { | |
| function f() public pure returns (uint r) { | |
| assembly { function f() -> x { x := 1 } r := f() } | |
| } | |
| function g() public pure returns (uint r) { | |
| assembly { function f() -> x { x := 2 } r := f() } | |
| } | |
| } |
Also in function_name_clash.sol below.
| contract C { | ||
| function f() public pure returns (uint r) { | ||
| assembly { function f() -> x { x := 1 } r := f() } | ||
| } | ||
| function g() public pure returns (uint r) { | ||
| assembly { function f() -> x { x := 2 } r := f() } | ||
| } | ||
| } |
|
Incorporated #12149 into the test. |
cameel
left a comment
cameel
left a comment
There was a problem hiding this comment.
There are still some open comments that could be applied to improve the command-line test output but overall the fix seems correct and does the job even in the current form so I'm approving.
chriseth
force-pushed
the
nonamedlabelsifnotunique
branch
from
346a850 to
9f48b74
Compare
|
Rebased, simplified commandline tests and updated the "fixes". |
Fixes #12090
Fixes #12149
Fixes #12158