mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #11026 from ethereum/resolve-keccak
Evaluate ``keccak256(a, const)``, when the value at memory location ``a`` is known at compile time and ``const <= 32``
This commit is contained in:
Harikrishnan Mulackal
@@ -0,0 +1 @@
|
||||
--ir-optimized --optimize --optimize-runs 50000
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1,21 @@
|
||||
// SPDX-License-Identifier: GPL-v3
|
||||
pragma solidity >= 0.0.0;
|
||||
|
||||
contract C {
|
||||
constructor() {
|
||||
assembly {
|
||||
mstore(0, 100)
|
||||
// because this is part of deploy code, the keccak will not be evaluated
|
||||
sstore(0, keccak256(0, 32))
|
||||
}
|
||||
}
|
||||
|
||||
fallback() external {
|
||||
assembly {
|
||||
mstore(0, 100)
|
||||
// The keccak here would be evaluated
|
||||
sstore(0, keccak256(0, 32))
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
Optimized IR:
|
||||
/*******************************************************
|
||||
* WARNING *
|
||||
* Solidity to Yul compilation is still EXPERIMENTAL *
|
||||
* It can result in LOSS OF FUNDS or worse *
|
||||
* !USE AT YOUR OWN RISK! *
|
||||
*******************************************************/
|
||||
|
||||
object "C_12" {
|
||||
code {
|
||||
{
|
||||
mstore(64, 128)
|
||||
if callvalue() { revert(0, 0) }
|
||||
mstore(0, 100)
|
||||
sstore(0, keccak256(0, 32))
|
||||
let _1 := datasize("C_12_deployed")
|
||||
codecopy(0, dataoffset("C_12_deployed"), _1)
|
||||
return(0, _1)
|
||||
}
|
||||
}
|
||||
object "C_12_deployed" {
|
||||
code {
|
||||
{
|
||||
mstore(64, 128)
|
||||
if callvalue() { revert(0, 0) }
|
||||
mstore(0, 100)
|
||||
sstore(0, 17385872270140913825666367956517731270094621555228275961425792378517567244498)
|
||||
stop()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
--ir-optimized --optimize --optimize-runs 1
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1,12 @@
|
||||
// SPDX-License-Identifier: GPL-v3
|
||||
pragma solidity >= 0.0.0;
|
||||
|
||||
contract C {
|
||||
fallback() external {
|
||||
assembly {
|
||||
mstore(0, 100)
|
||||
// because of the low runs value, the constant will not be optimized
|
||||
sstore(0, keccak256(0, 32))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
Optimized IR:
|
||||
/*******************************************************
|
||||
* WARNING *
|
||||
* Solidity to Yul compilation is still EXPERIMENTAL *
|
||||
* It can result in LOSS OF FUNDS or worse *
|
||||
* !USE AT YOUR OWN RISK! *
|
||||
*******************************************************/
|
||||
|
||||
object "C_7" {
|
||||
code {
|
||||
{
|
||||
mstore(64, 128)
|
||||
if callvalue() { revert(0, 0) }
|
||||
let _1 := datasize("C_7_deployed")
|
||||
codecopy(0, dataoffset("C_7_deployed"), _1)
|
||||
return(0, _1)
|
||||
}
|
||||
}
|
||||
object "C_7_deployed" {
|
||||
code {
|
||||
{
|
||||
mstore(64, 128)
|
||||
if callvalue() { revert(0, 0) }
|
||||
mstore(0, 100)
|
||||
sstore(0, keccak256(0, 32))
|
||||
stop()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -38,7 +38,7 @@ object "Arraysum_34" {
|
||||
}
|
||||
{
|
||||
mstore(_1, _1)
|
||||
let _3 := sload(add(keccak256(_1, 0x20), var_i))
|
||||
let _3 := sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i))
|
||||
if gt(var_sum, not(_3)) { panic_error_0x11() }
|
||||
var_sum := add(var_sum, _3)
|
||||
}
|
||||
|
||||
@@ -24,6 +24,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
|
||||
// gas irOptimized: 193626
|
||||
// gas irOptimized: 193543
|
||||
// gas legacy: 196426
|
||||
// gas legacyOptimized: 193405
|
||||
|
||||
@@ -26,6 +26,6 @@ contract C {
|
||||
// ----
|
||||
// library: L
|
||||
// f() -> 8, 7, 1, 2, 7, 12
|
||||
// gas irOptimized: 165112
|
||||
// gas irOptimized: 164899
|
||||
// gas legacy: 164775
|
||||
// gas legacyOptimized: 162697
|
||||
|
||||
@@ -53,6 +53,6 @@ contract C {
|
||||
// f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
|
||||
// f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
|
||||
// f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
|
||||
// gas irOptimized: 110400
|
||||
// gas irOptimized: 110283
|
||||
// gas legacy: 111328
|
||||
// gas legacyOptimized: 109206
|
||||
|
||||
@@ -19,7 +19,7 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
|
||||
// gas irOptimized: 172488
|
||||
// gas irOptimized: 172410
|
||||
// gas legacy: 175929
|
||||
// gas legacyOptimized: 172504
|
||||
// i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
|
||||
|
||||
@@ -11,6 +11,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
|
||||
// gas irOptimized: 130136
|
||||
// gas irOptimized: 130053
|
||||
// gas legacy: 131690
|
||||
// gas legacyOptimized: 130582
|
||||
|
||||
@@ -14,7 +14,7 @@ contract Test {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
|
||||
// gas irOptimized: 199732
|
||||
// gas irOptimized: 199693
|
||||
// gas legacy: 278685
|
||||
// gas legacyOptimized: 273594
|
||||
// data(uint256,uint256): 0x02, 0x02 -> 0x09
|
||||
|
||||
@@ -47,7 +47,7 @@ contract c {
|
||||
// gas legacyOptimized: 109706
|
||||
// storage: nonempty
|
||||
// test_long() -> 67
|
||||
// gas irOptimized: 134403
|
||||
// gas irOptimized: 134320
|
||||
// gas legacy: 213590
|
||||
// gas legacyOptimized: 211044
|
||||
// storage: nonempty
|
||||
|
||||
@@ -19,6 +19,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0
|
||||
// gas irOptimized: 310785
|
||||
// gas irOptimized: 309167
|
||||
// gas legacy: 483915
|
||||
// gas legacyOptimized: 478672
|
||||
|
||||
@@ -15,7 +15,7 @@ contract c {
|
||||
// ----
|
||||
// getLength() -> 0
|
||||
// set(): 1, 2 -> true
|
||||
// gas irOptimized: 103032
|
||||
// gas irOptimized: 102993
|
||||
// gas legacy: 103126
|
||||
// gas legacyOptimized: 102967
|
||||
// getLength() -> 68
|
||||
|
||||
@@ -22,7 +22,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
|
||||
// gas irOptimized: 612299
|
||||
// gas irOptimized: 612216
|
||||
// gas legacy: 817315
|
||||
// gas legacyOptimized: 816813
|
||||
// retrieve() -> 9, 28, 9, 28, 4, 3, 32
|
||||
|
||||
@@ -23,6 +23,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> true
|
||||
// gas irOptimized: 107700
|
||||
// gas irOptimized: 107258
|
||||
// gas legacy: 107335
|
||||
// gas legacyOptimized: 105857
|
||||
|
||||
@@ -48,6 +48,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> true
|
||||
// gas irOptimized: 233831
|
||||
// gas irOptimized: 231941
|
||||
// gas legacy: 239061
|
||||
// gas legacyOptimized: 235988
|
||||
|
||||
@@ -15,6 +15,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0
|
||||
// gas irOptimized: 139474
|
||||
// gas irOptimized: 139105
|
||||
// gas legacy: 138913
|
||||
// gas legacyOptimized: 137448
|
||||
|
||||
@@ -42,11 +42,11 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0
|
||||
// gas irOptimized: 107703
|
||||
// gas irOptimized: 107266
|
||||
// gas legacy: 107306
|
||||
// gas legacyOptimized: 105861
|
||||
// g() -> 0
|
||||
// h() -> 0
|
||||
// gas irOptimized: 107749
|
||||
// gas irOptimized: 107312
|
||||
// gas legacy: 107328
|
||||
// gas legacyOptimized: 105903
|
||||
|
||||
@@ -21,6 +21,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
|
||||
// gas irOptimized: 246670
|
||||
// gas irOptimized: 245944
|
||||
// gas legacy: 276683
|
||||
// gas legacyOptimized: 275534
|
||||
|
||||
@@ -37,12 +37,12 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0x02000202
|
||||
// gas irOptimized: 2471556
|
||||
// gas irOptimized: 2470372
|
||||
// gas legacy: 2288641
|
||||
// gas legacyOptimized: 2258654
|
||||
// storage: empty
|
||||
// clear() -> 0, 0
|
||||
// gas irOptimized: 1854143
|
||||
// gas irOptimized: 1852821
|
||||
// gas legacy: 1727169
|
||||
// gas legacyOptimized: 1698931
|
||||
// storage: empty
|
||||
|
||||
@@ -15,6 +15,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
|
||||
// gas irOptimized: 610560
|
||||
// gas irOptimized: 610177
|
||||
// gas legacy: 604268
|
||||
// gas legacyOptimized: 603688
|
||||
|
||||
+1
-1
@@ -19,6 +19,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 5, 4
|
||||
// gas irOptimized: 235127
|
||||
// gas irOptimized: 234667
|
||||
// gas legacy: 237001
|
||||
// gas legacyOptimized: 235316
|
||||
|
||||
+1
-1
@@ -20,6 +20,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 5, 4
|
||||
// gas irOptimized: 265126
|
||||
// gas irOptimized: 264686
|
||||
// gas legacy: 264734
|
||||
// gas legacyOptimized: 263160
|
||||
|
||||
+1
-1
@@ -14,4 +14,4 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 9, 4
|
||||
// gas irOptimized: 99186
|
||||
// gas irOptimized: 99075
|
||||
|
||||
@@ -19,7 +19,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 4, 5
|
||||
// gas irOptimized: 258946
|
||||
// gas irOptimized: 257752
|
||||
// gas legacy: 255936
|
||||
// gas legacyOptimized: 254359
|
||||
// storage: empty
|
||||
|
||||
+1
-1
@@ -17,6 +17,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
|
||||
// gas irOptimized: 168812
|
||||
// gas irOptimized: 166791
|
||||
// gas legacy: 163978
|
||||
// gas legacyOptimized: 158155
|
||||
|
||||
@@ -38,10 +38,10 @@ contract c {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
|
||||
// gas irOptimized: 179354
|
||||
// gas irOptimized: 179148
|
||||
// test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
|
||||
// gas irOptimized: 154106
|
||||
// gas irOptimized: 153938
|
||||
// test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
|
||||
// gas irOptimized: 132579
|
||||
// gas irOptimized: 132378
|
||||
// test4(uint256[2][2]): 23, 42, 23, 42 -> 65
|
||||
// gas irOptimized: 105395
|
||||
|
||||
@@ -40,12 +40,12 @@ contract Test {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 24
|
||||
// gas irOptimized: 216453
|
||||
// gas irOptimized: 216291
|
||||
// gas legacy: 215533
|
||||
// gas legacyOptimized: 214947
|
||||
// test1() -> 3
|
||||
// test2() -> 6
|
||||
// test3() -> 24
|
||||
// gas irOptimized: 122996
|
||||
// gas irOptimized: 122838
|
||||
// gas legacy: 122795
|
||||
// gas legacyOptimized: 121883
|
||||
|
||||
+1
-1
@@ -17,4 +17,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
|
||||
// gas irOptimized: 123029
|
||||
// gas irOptimized: 122861
|
||||
|
||||
@@ -19,4 +19,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f() -> 10, 11, 12
|
||||
// gas irOptimized: 122025
|
||||
// gas irOptimized: 121857
|
||||
|
||||
+1
-1
@@ -23,4 +23,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
|
||||
// gas irOptimized: 353951
|
||||
// gas irOptimized: 352878
|
||||
|
||||
+1
-1
@@ -26,4 +26,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f() -> 3, 3, 3, 1
|
||||
// gas irOptimized: 187586
|
||||
// gas irOptimized: 187277
|
||||
|
||||
@@ -12,7 +12,7 @@ contract Test {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
|
||||
// gas irOptimized: 120898
|
||||
// gas irOptimized: 120859
|
||||
// gas legacy: 125815
|
||||
// gas legacyOptimized: 123614
|
||||
// data(uint256): 7 -> 8
|
||||
|
||||
@@ -23,21 +23,21 @@ contract c {
|
||||
// gas legacy: 255464
|
||||
// gas legacyOptimized: 250998
|
||||
// f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
|
||||
// gas irOptimized: 232312
|
||||
// gas irOptimized: 229335
|
||||
// gas legacy: 267931
|
||||
// gas legacyOptimized: 263329
|
||||
// f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
|
||||
// gas irOptimized: 241107
|
||||
// gas irOptimized: 238042
|
||||
// gas legacy: 277538
|
||||
// gas legacyOptimized: 272818
|
||||
// f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
|
||||
// gas irOptimized: 354417
|
||||
// gas irOptimized: 348712
|
||||
// gas legacy: 423428
|
||||
// gas legacyOptimized: 414868
|
||||
// f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
|
||||
// gas legacy: 106445
|
||||
// gas legacyOptimized: 104379
|
||||
// f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
|
||||
// gas irOptimized: 813872
|
||||
// gas irOptimized: 802359
|
||||
// gas legacy: 954517
|
||||
// gas legacyOptimized: 937521
|
||||
|
||||
@@ -11,6 +11,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
|
||||
// gas irOptimized: 105262
|
||||
// gas irOptimized: 105184
|
||||
// gas legacy: 105365
|
||||
// gas legacyOptimized: 105147
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
|
||||
// gas irOptimized: 172401
|
||||
// gas irOptimized: 172318
|
||||
// gas legacy: 174794
|
||||
// gas legacyOptimized: 174188
|
||||
// g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
|
||||
|
||||
@@ -48,6 +48,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0xff
|
||||
// gas irOptimized: 136320
|
||||
// gas irOptimized: 136164
|
||||
// gas legacy: 137645
|
||||
// gas legacyOptimized: 134376
|
||||
|
||||
@@ -18,6 +18,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 7
|
||||
// gas irOptimized: 134158
|
||||
// gas irOptimized: 133946
|
||||
// gas legacy: 211296
|
||||
// gas legacyOptimized: 211087
|
||||
|
||||
@@ -9,7 +9,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// set(): 1, 2, 3, 4, 5 -> true
|
||||
// gas irOptimized: 163719
|
||||
// gas irOptimized: 163680
|
||||
// gas legacy: 163756
|
||||
// gas legacyOptimized: 163596
|
||||
// storage: nonempty
|
||||
|
||||
@@ -20,6 +20,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 3
|
||||
// gas irOptimized: 174188
|
||||
// gas irOptimized: 173135
|
||||
// gas legacy: 179707
|
||||
// gas legacyOptimized: 178763
|
||||
|
||||
@@ -19,6 +19,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 1, 2, 3, 4, 5, 6, 7
|
||||
// gas irOptimized: 212646
|
||||
// gas irOptimized: 212108
|
||||
// gas legacy: 223725
|
||||
// gas legacyOptimized: 222886
|
||||
|
||||
@@ -13,6 +13,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
|
||||
// gas irOptimized: 198396
|
||||
// gas irOptimized: 198279
|
||||
// gas legacy: 199159
|
||||
// gas legacyOptimized: 198137
|
||||
|
||||
@@ -20,6 +20,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 1, 2, 3, 4, 5, 6, 7
|
||||
// gas irOptimized: 212646
|
||||
// gas irOptimized: 212108
|
||||
// gas legacy: 223730
|
||||
// gas legacyOptimized: 222891
|
||||
|
||||
@@ -26,6 +26,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 11, 0x0c, 1, 0x15, 22, 4
|
||||
// gas irOptimized: 289252
|
||||
// gas irOptimized: 288695
|
||||
// gas legacy: 296916
|
||||
// gas legacyOptimized: 283163
|
||||
|
||||
@@ -15,6 +15,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 2, 3, 4
|
||||
// gas irOptimized: 209796
|
||||
// gas irOptimized: 208083
|
||||
// gas legacy: 241549
|
||||
// gas legacyOptimized: 236002
|
||||
|
||||
@@ -18,6 +18,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test1() -> true
|
||||
// gas irOptimized: 532255
|
||||
// gas irOptimized: 527501
|
||||
// gas legacy: 613377
|
||||
// gas legacyOptimized: 606411
|
||||
|
||||
@@ -16,4 +16,4 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0, 0, 0
|
||||
// gas irOptimized: 101573
|
||||
// gas irOptimized: 101279
|
||||
|
||||
@@ -16,7 +16,7 @@ contract c {
|
||||
// ----
|
||||
// storage: empty
|
||||
// fill() ->
|
||||
// gas irOptimized: 535917
|
||||
// gas irOptimized: 535098
|
||||
// gas legacy: 504373
|
||||
// gas legacyOptimized: 499648
|
||||
// storage: nonempty
|
||||
|
||||
@@ -44,7 +44,7 @@ contract c {
|
||||
// ----
|
||||
// getLengths() -> 0, 0
|
||||
// setLengths(uint256,uint256): 48, 49 ->
|
||||
// gas irOptimized: 275838
|
||||
// gas irOptimized: 273726
|
||||
// gas legacy: 308271
|
||||
// gas legacyOptimized: 300117
|
||||
// getLengths() -> 48, 49
|
||||
|
||||
@@ -18,7 +18,7 @@ contract c {
|
||||
// ----
|
||||
// storage: empty
|
||||
// fill() -> 8
|
||||
// gas irOptimized: 170102
|
||||
// gas irOptimized: 168980
|
||||
// gas legacy: 165456
|
||||
// gas legacyOptimized: 164387
|
||||
// storage: nonempty
|
||||
|
||||
@@ -25,7 +25,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 1, 2, 3
|
||||
// gas irOptimized: 2461941
|
||||
// gas irOptimized: 2455497
|
||||
// gas legacy: 2416722
|
||||
// gas legacyOptimized: 2405396
|
||||
// storage: empty
|
||||
|
||||
@@ -20,7 +20,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 38, 28, 18
|
||||
// gas irOptimized: 532515
|
||||
// gas irOptimized: 527367
|
||||
// gas legacy: 454080
|
||||
// gas legacyOptimized: 443170
|
||||
// storage: empty
|
||||
|
||||
@@ -20,7 +20,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 20, 10
|
||||
// gas irOptimized: 369849
|
||||
// gas irOptimized: 367121
|
||||
// gas legacy: 320859
|
||||
// gas legacyOptimized: 314681
|
||||
// storage: empty
|
||||
|
||||
@@ -12,6 +12,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
|
||||
// gas irOptimized: 162592
|
||||
// gas irOptimized: 162426
|
||||
// gas legacy: 245809
|
||||
// gas legacyOptimized: 242636
|
||||
|
||||
@@ -18,7 +18,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> true
|
||||
// gas irOptimized: 447028
|
||||
// gas irOptimized: 445718
|
||||
// gas legacy: 552064
|
||||
// gas legacyOptimized: 533164
|
||||
// storage: empty
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() ->
|
||||
// gas irOptimized: 291984
|
||||
// gas irOptimized: 291114
|
||||
// gas legacy: 372763
|
||||
// gas legacyOptimized: 366846
|
||||
// storage: empty
|
||||
|
||||
@@ -12,6 +12,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
|
||||
// gas irOptimized: 159929
|
||||
// gas irOptimized: 159714
|
||||
// gas legacy: 243287
|
||||
// gas legacyOptimized: 240361
|
||||
|
||||
@@ -18,6 +18,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 5, 4, 3, 3
|
||||
// gas irOptimized: 110915
|
||||
// gas irOptimized: 110669
|
||||
// gas legacy: 111938
|
||||
// gas legacyOptimized: 110528
|
||||
|
||||
@@ -14,6 +14,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
|
||||
// gas irOptimized: 116340
|
||||
// gas irOptimized: 116184
|
||||
// gas legacy: 116886
|
||||
// gas legacyOptimized: 116699
|
||||
|
||||
@@ -16,6 +16,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 1, 2, 3, 4
|
||||
// gas irOptimized: 112009
|
||||
// gas irOptimized: 111583
|
||||
// gas legacy: 107098
|
||||
// gas legacyOptimized: 106362
|
||||
|
||||
@@ -22,6 +22,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 2, 3, 4, 5
|
||||
// gas irOptimized: 146470
|
||||
// gas irOptimized: 146270
|
||||
// gas legacy: 190684
|
||||
// gas legacyOptimized: 188256
|
||||
|
||||
@@ -18,6 +18,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
|
||||
// gas irOptimized: 148198
|
||||
// gas irOptimized: 147998
|
||||
// gas legacy: 152444
|
||||
// gas legacyOptimized: 146671
|
||||
|
||||
@@ -17,6 +17,6 @@ contract c {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// test() -> 0
|
||||
// gas irOptimized: 396502
|
||||
// gas irOptimized: 394087
|
||||
// gas legacy: 565428
|
||||
// gas legacyOptimized: 552524
|
||||
|
||||
@@ -29,14 +29,14 @@ contract C {
|
||||
// ----
|
||||
// l() -> 0
|
||||
// f(uint256,uint256): 42, 64 ->
|
||||
// gas irOptimized: 202660
|
||||
// gas irOptimized: 202621
|
||||
// gas legacy: 163034
|
||||
// gas legacyOptimized: 157045
|
||||
// l() -> 1
|
||||
// ll(uint256): 0 -> 43
|
||||
// a(uint256,uint256): 0, 42 -> 64
|
||||
// f(uint256,uint256): 84, 128 ->
|
||||
// gas irOptimized: 298876
|
||||
// gas irOptimized: 298837
|
||||
// gas legacy: 222080
|
||||
// gas legacyOptimized: 210631
|
||||
// l() -> 2
|
||||
|
||||
@@ -23,7 +23,7 @@ contract C {
|
||||
// ----
|
||||
// l() -> 0
|
||||
// g(uint256): 70 ->
|
||||
// gas irOptimized: 430584
|
||||
// gas irOptimized: 428829
|
||||
// gas legacy: 419791
|
||||
// gas legacyOptimized: 415408
|
||||
// l() -> 70
|
||||
|
||||
@@ -26,6 +26,6 @@ contract Creator {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
|
||||
// gas irOptimized: 469081
|
||||
// gas irOptimized: 474619
|
||||
// gas legacy: 570900
|
||||
// gas legacyOptimized: 436724
|
||||
|
||||
@@ -26,6 +26,6 @@ contract Creator {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
|
||||
// gas irOptimized: 325793
|
||||
// gas irOptimized: 330923
|
||||
// gas legacy: 414850
|
||||
// gas legacyOptimized: 292281
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
contract C {
|
||||
function g() public returns (uint ret) {
|
||||
uint x = type(uint).max;
|
||||
assembly {
|
||||
mstore(0x20, x)
|
||||
// both old and new optimizer should be able to evaluate this
|
||||
ret := keccak256(0x20, 16)
|
||||
}
|
||||
}
|
||||
|
||||
function f() public returns (uint ret) {
|
||||
uint x = type(uint).max;
|
||||
assembly {
|
||||
mstore(0x20, x)
|
||||
// For Yul optimizer, load resolver and loop invariant code motion
|
||||
// would take the Keccak-256 outside the loop. For the old-optimizer,
|
||||
// this is not possible.
|
||||
// Net savings approximately: 20 * cost of Keccak-256 = 572
|
||||
for {let i := 0} lt(i, 20) { i := add(i, 1) } {
|
||||
ret := keccak256(0x20, 16)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
|
||||
// gas irOptimized: 22521
|
||||
// gas legacy: 23385
|
||||
// gas legacyOptimized: 23092
|
||||
// g() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
|
||||
// gas irOptimized: 21391
|
||||
// gas legacy: 21462
|
||||
// gas legacyOptimized: 21256
|
||||
+1
-1
@@ -18,6 +18,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
|
||||
// gas irOptimized: 197936
|
||||
// gas irOptimized: 197768
|
||||
// gas legacy: 205149
|
||||
// gas legacyOptimized: 196983
|
||||
|
||||
@@ -25,7 +25,7 @@ contract c {
|
||||
// ----
|
||||
// storage: empty
|
||||
// set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
|
||||
// gas irOptimized: 124266
|
||||
// gas irOptimized: 124227
|
||||
// gas legacy: 124736
|
||||
// gas legacyOptimized: 124179
|
||||
// test(uint256): 32 -> "3"
|
||||
|
||||
@@ -33,4 +33,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f() -> 0, 0, 0
|
||||
// gas irOptimized: 124110
|
||||
// gas irOptimized: 123854
|
||||
|
||||
@@ -44,7 +44,7 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f() ->
|
||||
// gas irOptimized: 123095
|
||||
// gas irOptimized: 122810
|
||||
// gas legacy: 126832
|
||||
// gas legacyOptimized: 125500
|
||||
// g() ->
|
||||
|
||||
@@ -27,4 +27,4 @@ contract C {
|
||||
// compileViaYul: true
|
||||
// ----
|
||||
// f() -> 0
|
||||
// gas irOptimized: 118035
|
||||
// gas irOptimized: 117902
|
||||
|
||||
@@ -36,6 +36,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// f(bytes): 0x20, 0x5, "abcde" -> 0
|
||||
// gas irOptimized: 241858
|
||||
// gas irOptimized: 241342
|
||||
// gas legacy: 239258
|
||||
// gas legacyOptimized: 238582
|
||||
|
||||
@@ -22,6 +22,6 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// g() -> 2, 6
|
||||
// gas irOptimized: 169848
|
||||
// gas irOptimized: 169804
|
||||
// gas legacy: 172490
|
||||
// gas legacyOptimized: 171209
|
||||
|
||||
@@ -18,33 +18,33 @@ contract C {
|
||||
// ----
|
||||
// test_indices(uint256): 1 ->
|
||||
// test_indices(uint256): 129 ->
|
||||
// gas irOptimized: 3457322
|
||||
// gas irOptimized: 3442268
|
||||
// gas legacy: 3340105
|
||||
// gas legacyOptimized: 3280773
|
||||
// test_indices(uint256): 5 ->
|
||||
// gas irOptimized: 474246
|
||||
// gas irOptimized: 467656
|
||||
// gas legacy: 458941
|
||||
// gas legacyOptimized: 455849
|
||||
// test_indices(uint256): 10 ->
|
||||
// test_indices(uint256): 15 ->
|
||||
// gas irOptimized: 110435
|
||||
// gas irOptimized: 109070
|
||||
// test_indices(uint256): 0xFF ->
|
||||
// gas irOptimized: 4338190
|
||||
// gas irOptimized: 4308940
|
||||
// gas legacy: 4107867
|
||||
// gas legacyOptimized: 3991807
|
||||
// test_indices(uint256): 1000 ->
|
||||
// gas irOptimized: 21240617
|
||||
// gas irOptimized: 21133562
|
||||
// gas legacy: 20360399
|
||||
// gas legacyOptimized: 19921344
|
||||
// test_indices(uint256): 129 ->
|
||||
// gas irOptimized: 3654995
|
||||
// gas irOptimized: 3601383
|
||||
// gas legacy: 3472135
|
||||
// gas legacyOptimized: 3415947
|
||||
// test_indices(uint256): 128 ->
|
||||
// gas irOptimized: 658131
|
||||
// gas irOptimized: 648097
|
||||
// gas legacy: 556972
|
||||
// gas legacyOptimized: 508124
|
||||
// test_indices(uint256): 1 ->
|
||||
// gas irOptimized: 464827
|
||||
// gas irOptimized: 458399
|
||||
// gas legacy: 452407
|
||||
// gas legacyOptimized: 450811
|
||||
|
||||
@@ -18,11 +18,11 @@ contract C {
|
||||
// test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
|
||||
// test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
|
||||
// test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
|
||||
// gas irOptimized: 677730
|
||||
// gas irOptimized: 668136
|
||||
// gas legacy: 648515
|
||||
// gas legacyOptimized: 628739
|
||||
// test_boundary_check(uint256,uint256): 256, 255 -> 0
|
||||
// gas irOptimized: 678750
|
||||
// gas irOptimized: 669117
|
||||
// gas legacy: 649549
|
||||
// gas legacyOptimized: 629633
|
||||
// test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
|
||||
|
||||
@@ -54,18 +54,18 @@ contract C {
|
||||
// ----
|
||||
// test_zeroed_indicies(uint256): 1 ->
|
||||
// test_zeroed_indicies(uint256): 5 ->
|
||||
// gas irOptimized: 198357
|
||||
// gas irOptimized: 196818
|
||||
// gas legacy: 191267
|
||||
// gas legacyOptimized: 188486
|
||||
// test_zeroed_indicies(uint256): 10 ->
|
||||
// gas irOptimized: 289249
|
||||
// gas irOptimized: 286446
|
||||
// gas legacy: 276129
|
||||
// gas legacyOptimized: 271024
|
||||
// test_zeroed_indicies(uint256): 15 ->
|
||||
// gas irOptimized: 358284
|
||||
// gas irOptimized: 354256
|
||||
// gas legacy: 339254
|
||||
// gas legacyOptimized: 331904
|
||||
// test_zeroed_indicies(uint256): 0xFF ->
|
||||
// gas irOptimized: 8808359
|
||||
// gas irOptimized: 8736366
|
||||
// gas legacy: 8477449
|
||||
// gas legacyOptimized: 8343774
|
||||
|
||||
@@ -13,11 +13,11 @@ contract C {
|
||||
// compileViaYul: also
|
||||
// ----
|
||||
// pushEmpty(uint256): 128
|
||||
// gas irOptimized: 630896
|
||||
// gas irOptimized: 620912
|
||||
// gas legacy: 607287
|
||||
// gas legacyOptimized: 589048
|
||||
// pushEmpty(uint256): 256
|
||||
// gas irOptimized: 861040
|
||||
// gas irOptimized: 846064
|
||||
// gas legacy: 828983
|
||||
// gas legacyOptimized: 802808
|
||||
// pushEmpty(uint256): 32768 -> FAILURE # out-of-gas #
|
||||
|
||||
@@ -18,15 +18,15 @@ contract C {
|
||||
// set_get_length(uint256): 10 -> 10
|
||||
// set_get_length(uint256): 20 -> 20
|
||||
// set_get_length(uint256): 0 -> 0
|
||||
// gas irOptimized: 110079
|
||||
// gas irOptimized: 109299
|
||||
// gas legacy: 107830
|
||||
// gas legacyOptimized: 107262
|
||||
// set_get_length(uint256): 0xFF -> 0xFF
|
||||
// gas irOptimized: 701506
|
||||
// gas irOptimized: 691561
|
||||
// gas legacy: 882337
|
||||
// gas legacyOptimized: 650704
|
||||
// set_get_length(uint256): 0xFFF -> 0xFFF
|
||||
// gas irOptimized: 10226863
|
||||
// gas irOptimized: 10077103
|
||||
// gas legacy: 12945874
|
||||
// gas legacyOptimized: 9462646
|
||||
// set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
|
||||
|
||||
@@ -15,15 +15,15 @@ contract C {
|
||||
// set_get_length(uint256): 1 -> 0
|
||||
// set_get_length(uint256): 10 -> 0
|
||||
// set_get_length(uint256): 20 -> 0
|
||||
// gas irOptimized: 162505
|
||||
// gas irOptimized: 160945
|
||||
// gas legacy: 141922
|
||||
// gas legacyOptimized: 139708
|
||||
// set_get_length(uint256): 0xFF -> 0
|
||||
// gas irOptimized: 1790350
|
||||
// gas irOptimized: 1770460
|
||||
// gas legacy: 1524427
|
||||
// gas legacyOptimized: 1500358
|
||||
// set_get_length(uint256): 0xFFF -> 0
|
||||
// gas irOptimized: 28390042
|
||||
// gas irOptimized: 28070632
|
||||
// gas legacy: 24115159
|
||||
// gas legacyOptimized: 23733970
|
||||
// set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
|
||||
|
||||
@@ -317,7 +317,14 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
|
||||
}},
|
||||
{"fullSuite", [&]() {
|
||||
GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
|
||||
OptimiserSuite::run(*m_dialect, &meter, *m_object, true, solidity::frontend::OptimiserSettings::DefaultYulOptimiserSteps);
|
||||
OptimiserSuite::run(
|
||||
*m_dialect,
|
||||
&meter,
|
||||
*m_object,
|
||||
true,
|
||||
frontend::OptimiserSettings::DefaultYulOptimiserSteps,
|
||||
frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
|
||||
);
|
||||
}},
|
||||
{"stackLimitEvader", [&]() {
|
||||
disambiguate();
|
||||
@@ -434,6 +441,7 @@ void YulOptimizerTestCommon::updateContext()
|
||||
m_context = make_unique<OptimiserStepContext>(OptimiserStepContext{
|
||||
*m_dialect,
|
||||
*m_nameDispenser,
|
||||
m_reservedIdentifiers
|
||||
m_reservedIdentifiers,
|
||||
frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
|
||||
});
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
// The yul code for the following contract
|
||||
// contract C {
|
||||
// uint256[] x;
|
||||
// function f() public { x[10] = 5; }
|
||||
// }
|
||||
|
||||
{
|
||||
let _1 := 0
|
||||
if eq(0x26121ff0, shr(224, calldataload(_1)))
|
||||
{
|
||||
if callvalue() { revert(_1, _1) }
|
||||
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
|
||||
if iszero(lt(0x0a, sload(_1)))
|
||||
{
|
||||
mstore(_1, shl(224, 0x4e487b71))
|
||||
mstore(4, 0x32)
|
||||
revert(_1, 0x24)
|
||||
}
|
||||
mstore(_1, _1)
|
||||
// The hash should be evaluated here
|
||||
sstore(add(keccak256(_1, 0x20), 0x0a), 0x05)
|
||||
}
|
||||
}
|
||||
// ====
|
||||
// EVMVersion: >=constantinople
|
||||
// ----
|
||||
// step: fullSuite
|
||||
//
|
||||
// {
|
||||
// {
|
||||
// let _1 := 0
|
||||
// if eq(0x26121ff0, shr(224, calldataload(_1)))
|
||||
// {
|
||||
// if callvalue() { revert(_1, _1) }
|
||||
// if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
|
||||
// if iszero(lt(0x0a, sload(_1)))
|
||||
// {
|
||||
// mstore(_1, shl(224, 0x4e487b71))
|
||||
// mstore(4, 0x32)
|
||||
// revert(_1, 0x24)
|
||||
// }
|
||||
// mstore(_1, _1)
|
||||
// sstore(0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56d, 0x05)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
mstore(0, 10)
|
||||
/// >>> int.from_bytes(web3.Web3.keccak(int.to_bytes(10, 32, byteorder='big')), byteorder='big')
|
||||
/// 89717814153306320011181716697424560163256864414616650038987186496166826726056
|
||||
let val := keccak256(0, 32)
|
||||
sstore(0, val)
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 10
|
||||
// let _2 := 0
|
||||
// mstore(_2, _1)
|
||||
// sstore(_2, 89717814153306320011181716697424560163256864414616650038987186496166826726056)
|
||||
// }
|
||||
@@ -0,0 +1,18 @@
|
||||
{
|
||||
mstore(0, 30)
|
||||
if calldataload(0) {
|
||||
mstore(0, 20)
|
||||
}
|
||||
let val := keccak256(0, 32)
|
||||
sstore(0, val)
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 30
|
||||
// let _2 := 0
|
||||
// mstore(_2, _1)
|
||||
// if calldataload(_2) { mstore(_2, 20) }
|
||||
// sstore(_2, keccak256(_2, 32))
|
||||
// }
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
mstore(100, 10)
|
||||
mstore(132, 5)
|
||||
// Won't be evaluated, even though the value is known
|
||||
let val := keccak256(10, 33)
|
||||
sstore(0, val)
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 10
|
||||
// mstore(100, _1)
|
||||
// mstore(132, 5)
|
||||
// sstore(0, keccak256(_1, 33))
|
||||
// }
|
||||
@@ -0,0 +1,31 @@
|
||||
// import web3
|
||||
// >>> asBytes = int(10).to_bytes(32, byteorder='big')
|
||||
// >>> int.from_bytes(web3.Web3.keccak(asBytes[:31]), byteorder='big')
|
||||
// 9948786400348073077032572701554570401043517428989726124163377057770909578447
|
||||
// >>> int.from_bytes(web3.Web3.keccak(asBytes[:30]), byteorder='big')
|
||||
// 110945455955148346822663466543669633859020391897956790847617069135813044810108
|
||||
// >>> int.from_bytes(web3.Web3.keccak(asBytes[:1]), byteorder='big')
|
||||
// 85131057757245807317576516368191972321038229705283732634690444270750521936266
|
||||
// >>> int.from_bytes(web3.Web3.keccak(b''), byteorder='big')
|
||||
// 89477152217924674838424037953991966239322087453347756267410168184682657981552
|
||||
{
|
||||
mstore(0, 10)
|
||||
sstore(0, keccak256(0, 31))
|
||||
sstore(1, keccak256(0, 30))
|
||||
sstore(2, keccak256(0, 1))
|
||||
sstore(2, keccak256(0, 0))
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 10
|
||||
// let _2 := 0
|
||||
// mstore(_2, _1)
|
||||
// sstore(_2, 9948786400348073077032572701554570401043517428989726124163377057770909578447)
|
||||
// sstore(1, 110945455955148346822663466543669633859020391897956790847617069135813044810108)
|
||||
// let _13 := 85131057757245807317576516368191972321038229705283732634690444270750521936266
|
||||
// let _14 := 2
|
||||
// sstore(_14, _13)
|
||||
// sstore(_14, 89477152217924674838424037953991966239322087453347756267410168184682657981552)
|
||||
// }
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
let converted := 14
|
||||
let _1 := 50
|
||||
mstore(_1, "abcdefghijklmn")
|
||||
// >>> int.from_bytes(web3.Web3.keccak(text="abcdefghijklmn"), byteorder='big')
|
||||
// 51246744213555520563123611275127692828770413530219146609532820042079541949502
|
||||
|
||||
sstore(0, keccak256(_1, converted))
|
||||
sstore(0, add(mload(_1), 1))
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 50
|
||||
// let _2 := "abcdefghijklmn"
|
||||
// mstore(_1, _2)
|
||||
// let _3 := 51246744213555520563123611275127692828770413530219146609532820042079541949502
|
||||
// let _4 := 0
|
||||
// sstore(_4, _3)
|
||||
// sstore(_4, add(_2, 1))
|
||||
// }
|
||||
@@ -0,0 +1,22 @@
|
||||
// Test where the location of the memory offset is not known at compile time
|
||||
// >>> import web3
|
||||
// >>> asBytes = int(500).to_bytes(32, byteorder='big')
|
||||
// >>> int.from_bytes(web3.Web3.keccak(asBytes), byteorder='big')
|
||||
// 92647596584187651892918913434663110448935397770592030057655219009846081465370
|
||||
// >>> int.from_bytes(web3.Web3.keccak(asBytes[:16]), byteorder='big')
|
||||
// 110620294328144418057589324861608220015688365608948720310623173341503153578932
|
||||
{
|
||||
let offset := calldataload(0)
|
||||
mstore(offset, 500)
|
||||
sstore(0, keccak256(offset, 32))
|
||||
sstore(1, keccak256(offset, 16))
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := 0
|
||||
// mstore(calldataload(_1), 500)
|
||||
// sstore(_1, 92647596584187651892918913434663110448935397770592030057655219009846081465370)
|
||||
// sstore(1, 110620294328144418057589324861608220015688365608948720310623173341503153578932)
|
||||
// }
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
sstore(0, msize())
|
||||
mstore(0, 10)
|
||||
// Keccak-256 should not be evaluated because of the msize.
|
||||
// Even though, though the code is likely equivalent,
|
||||
// we skip steps if `msize` is present
|
||||
let val := keccak256(0, 32)
|
||||
sstore(1, val)
|
||||
}
|
||||
// ----
|
||||
// step: loadResolver
|
||||
//
|
||||
// {
|
||||
// let _1 := msize()
|
||||
// let _2 := 0
|
||||
// sstore(_2, _1)
|
||||
// mstore(_2, 10)
|
||||
// sstore(1, keccak256(_2, 32))
|
||||
// }
|
||||
@@ -43,6 +43,8 @@
|
||||
|
||||
#include <libsolutil/JSON.h>
|
||||
|
||||
#include <libsolidity/interface/OptimiserSettings.h>
|
||||
|
||||
#include <boost/algorithm/string/predicate.hpp>
|
||||
#include <boost/algorithm/string/join.hpp>
|
||||
#include <boost/program_options.hpp>
|
||||
@@ -191,7 +193,12 @@ public:
|
||||
char option = static_cast<char>(readStandardInputChar());
|
||||
cout << ' ' << option << endl;
|
||||
|
||||
OptimiserStepContext context{m_dialect, *m_nameDispenser, reservedIdentifiers};
|
||||
OptimiserStepContext context{
|
||||
m_dialect,
|
||||
*m_nameDispenser,
|
||||
reservedIdentifiers,
|
||||
solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
|
||||
};
|
||||
|
||||
auto abbreviationAndName = abbreviationMap.find(option);
|
||||
if (abbreviationAndName != abbreviationMap.end())
|
||||
|
||||
Reference in New Issue
Block a user