cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13687 from ethereum/hashNumberLiterals

Browse Source 
Hash number literals according to their value instead of their string representation.
This commit is contained in:
Daniel 2022-11-08 21:21:23 +01:00 committed by GitHub
commit 9db2da0385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -13,6 +13,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
* Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions. * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.

3
libyul/optimiser/BlockHasher.cpp
View File

@ -54,6 +54,9 @@ std::map<Block const*, uint64_t> BlockHasher::run(Block const& _block)
void BlockHasher::operator()(Literal const& _literal) void BlockHasher::operator()(Literal const& _literal)
{ {
hash64(compileTimeLiteralHash("Literal")); hash64(compileTimeLiteralHash("Literal"));
if (_literal.kind == LiteralKind::Number)
hash64(std::hash<u256>{}(valueOfNumberLiteral(_literal)));
else
hash64(_literal.value.hash()); hash64(_literal.value.hash());
hash64(_literal.type.hash()); hash64(_literal.type.hash());
hash8(static_cast<uint8_t>(_literal.kind)); hash8(static_cast<uint8_t>(_literal.kind));

6
test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
View File

@ -33,8 +33,8 @@ contract C {
// compileViaYul: true // compileViaYul: true
// ---- // ----
// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
// gas irOptimized: 332334 // gas irOptimized: 332586
// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
// gas irOptimized: 145029 // gas irOptimized: 145182
// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
// gas irOptimized: 192344 // gas irOptimized: 192512

6
test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
View File

@ -31,8 +31,8 @@ contract C {
// compileViaYul: true // compileViaYul: true
// ---- // ----
// test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
// gas irOptimized: 308790 // gas irOptimized: 309123
// test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
// gas irOptimized: 118077 // gas irOptimized: 118188
// test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
// gas irOptimized: 190775 // gas irOptimized: 190997

2
test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
View File

@ -28,7 +28,7 @@ contract C {
// compileViaYul: also // compileViaYul: also
// ---- // ----
// constructor() -> // constructor() ->
// gas irOptimized: 518935 // gas irOptimized: 464753
// gas legacy: 729908 // gas legacy: 729908
// gas legacyOptimized: 493347 // gas legacyOptimized: 493347
// h() -> 0x20, 0x40, 0x00, 0 // h() -> 0x20, 0x40, 0x00, 0

2
test/libsolidity/semanticTests/externalContracts/snark.sol
View File

@ -299,6 +299,6 @@ contract Test {
// gas legacyOptimized: 267239 // gas legacyOptimized: 267239
// verifyTx() -> true // verifyTx() -> true
// ~ emit Verified(string): 0x20, 0x16, "Successfully verified." // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
// gas irOptimized: 783949 // gas irOptimized: 784027
// gas legacy: 805423 // gas legacy: 805423
// gas legacyOptimized: 772571 // gas legacyOptimized: 772571

4
test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
View File

@ -49,11 +49,11 @@ contract C {
} }
// ---- // ----
// test_f() -> true // test_f() -> true
// gas irOptimized: 122053 // gas irOptimized: 122510
// gas legacy: 126150 // gas legacy: 126150
// gas legacyOptimized: 123163 // gas legacyOptimized: 123163
// test_g() -> true // test_g() -> true
// gas irOptimized: 106138 // gas irOptimized: 106903
// gas legacy: 112481 // gas legacy: 112481
// gas legacyOptimized: 107706 // gas legacyOptimized: 107706
// addresses(uint256): 0 -> 0x18 // addresses(uint256): 0 -> 0x18

17
test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul Normal file
View File

@ -0,0 +1,17 @@
{
f()
g()
function f() { mstore(0x01, mload(0x00)) }
function g() { mstore(1, mload(0)) }
}
// ----
// step: equivalentFunctionCombiner
//
// {
// f()
// f()
// function f()
// { mstore(0x01, mload(0x00)) }
// function g()
// { mstore(1, mload(0)) }
// }