-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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
[Sol->Yul] Optimizing delete struct. #9985
Merged
Merged
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 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 file contains 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
35 changes: 35 additions & 0 deletions
35
test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
This file contains 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,35 @@ | ||
contract C { | ||
struct S { | ||
uint32 a; | ||
S[] x; | ||
} | ||
S s; | ||
function f() public returns (uint256 r1, uint256 r2, uint256 r3) { | ||
assembly { | ||
// 2 ** 150 - 1 | ||
sstore(s.slot, 1427247692705959881058285969449495136382746623) | ||
} | ||
s.a = 1; | ||
s.x.push(); s.x.push(); | ||
S storage ptr1 = s.x[0]; | ||
S storage ptr2 = s.x[1]; | ||
assembly { | ||
// 2 ** 150 - 1 | ||
sstore(ptr1.slot, 1427247692705959881058285969449495136382746623) | ||
sstore(ptr2.slot, 1427247692705959881058285969449495136382746623) | ||
} | ||
s.x[0].a = 2; s.x[1].a = 3; | ||
delete s; | ||
assert(s.a == 0); | ||
assert(s.x.length == 0); | ||
assembly { | ||
r1 := sload(s.slot) | ||
r2 := sload(ptr1.slot) | ||
r3 := sload(ptr2.slot) | ||
} | ||
} | ||
} | ||
// ==== | ||
// compileViaYul: true | ||
// ---- | ||
// f() -> 0, 0, 0 |
24 changes: 24 additions & 0 deletions
24
test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
This file contains 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,24 @@ | ||
contract C { | ||
struct S { | ||
uint64 y; | ||
uint64 z; | ||
} | ||
S s; | ||
function f() public returns (uint256 ret) { | ||
assembly { | ||
// 2 ** 150 - 1 | ||
sstore(s.slot, 1427247692705959881058285969449495136382746623) | ||
} | ||
s.y = 1; s.z = 2; | ||
delete s; | ||
assert(s.y == 0); | ||
assert(s.z == 0); | ||
assembly { | ||
ret := sload(s.slot) | ||
} | ||
} | ||
} | ||
// ==== | ||
// compileViaYul: true | ||
// ---- | ||
// f() -> 0 |
29 changes: 29 additions & 0 deletions
29
test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
This file contains 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,29 @@ | ||
contract C { | ||
struct S { | ||
uint32 a; | ||
uint32[3] b; | ||
uint32[] x; | ||
} | ||
S s; | ||
function f() public returns (uint256 ret) { | ||
assembly { | ||
// 2 ** 150 - 1 | ||
sstore(s.slot, 1427247692705959881058285969449495136382746623) | ||
} | ||
s.a = 1; | ||
s.b[0] = 2; s.b[1] = 3; | ||
s.x.push(4); s.x.push(5); | ||
delete s; | ||
assert(s.a == 0); | ||
assert(s.b[0] == 0); | ||
assert(s.b[1] == 0); | ||
assert(s.x.length == 0); | ||
assembly { | ||
ret := sload(s.slot) | ||
} | ||
} | ||
} | ||
// ==== | ||
// compileViaYul: true | ||
// ---- | ||
// f() -> 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.
Maybe we should rather say "that old code generated for
delete
before adding that struct" or something like that, but I'd also say it's fine for now - we'll need to refine this in the end when we make it "public" anyways I expect.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.
Ah, you merged already anyways :-D.