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

Checks for overflow/underflow after add/sub operations.

Browse Source
This commit is contained in:
Matheus Aguiar 2022-06-03 17:04:16 -03:00
parent 3ed9a38abc
commit 4fd5c11af7
49 changed files with 450 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -8,7 +8,7 @@ Compiler Features:
* Yul IR Code Generation: Improved copy routines for arrays with packed storage layout. * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
* Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two. * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
* Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two. * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
* Code Generator: More efficient code for checked addition and subtraction.
Bugfixes: Bugfixes:
* Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``. * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.

64
libsolidity/codegen/YulUtilFunctions.cpp
View File

@ -615,25 +615,34 @@ string YulUtilFunctions::divide32CeilFunction()
string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type) string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
{ {
string functionName = "checked_add_" + _type.identifier(); string functionName = "checked_add_" + _type.identifier();
// TODO: Consider to add a special case for unsigned 256-bit integers
// and use the following instead:
// sum := add(x, y) if lt(sum, x) { <panic>() }
return m_functionCollector.createFunction(functionName, [&]() { return m_functionCollector.createFunction(functionName, [&]() {
return return
Whiskers(R"( Whiskers(R"(
function <functionName>(x, y) -> sum { function <functionName>(x, y) -> sum {
x := <cleanupFunction>(x) x := <cleanupFunction>(x)
y := <cleanupFunction>(y) y := <cleanupFunction>(y)
<?signed>
// overflow, if x >= 0 and y > (maxValue - x)
if and(iszero(slt(x, 0)), sgt(y, sub(<maxValue>, x))) { <panic>() }
// underflow, if x < 0 and y < (minValue - x)
if and(slt(x, 0), slt(y, sub(<minValue>, x))) { <panic>() }
<!signed>
// overflow, if x > (maxValue - y)
if gt(x, sub(<maxValue>, y)) { <panic>() }
</signed>
sum := add(x, y) sum := add(x, y)
<?signed>
<?256bit>
// overflow, if x >= 0 and sum < y
// underflow, if x < 0 and sum >= y
if or(
and(iszero(slt(x, 0)), slt(sum, y)),
and(slt(x, 0), iszero(slt(sum, y)))
) { <panic>() }
<!256bit>
if or(
sgt(sum, <maxValue>),
slt(sum, <minValue>)
) { <panic>() }
</256bit>
<!signed>
<?256bit>
if gt(x, sum) { <panic>() }
<!256bit>
if gt(sum, <maxValue>) { <panic>() }
</256bit>
</signed>
} }
)") )")
("functionName", functionName) ("functionName", functionName)
@ -642,6 +651,7 @@ string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
("minValue", toCompactHexWithPrefix(u256(_type.minValue()))) ("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
("cleanupFunction", cleanupFunction(_type)) ("cleanupFunction", cleanupFunction(_type))
("panic", panicFunction(PanicCode::UnderOverflow)) ("panic", panicFunction(PanicCode::UnderOverflow))
("256bit", _type.numBits() == 256)
.render(); .render();
}); });
} }
@ -795,15 +805,28 @@ string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
function <functionName>(x, y) -> diff { function <functionName>(x, y) -> diff {
x := <cleanupFunction>(x) x := <cleanupFunction>(x)
y := <cleanupFunction>(y) y := <cleanupFunction>(y)
<?signed>
// underflow, if y >= 0 and x < (minValue + y)
if and(iszero(slt(y, 0)), slt(x, add(<minValue>, y))) { <panic>() }
// overflow, if y < 0 and x > (maxValue + y)
if and(slt(y, 0), sgt(x, add(<maxValue>, y))) { <panic>() }
<!signed>
if lt(x, y) { <panic>() }
</signed>
diff := sub(x, y) diff := sub(x, y)
<?signed>
<?256bit>
// underflow, if y >= 0 and diff > x
// overflow, if y < 0 and diff < x
if or(
and(iszero(slt(y, 0)), sgt(diff, x)),
and(slt(y, 0), slt(diff, x))
) { <panic>() }
<!256bit>
if or(
slt(diff, <minValue>),
sgt(diff, <maxValue>)
) { <panic>() }
</256bit>
<!signed>
<?256bit>
if gt(diff, x) { <panic>() }
<!256bit>
if gt(diff, <maxValue>) { <panic>() }
</256bit>
</signed>
} }
)") )")
("functionName", functionName) ("functionName", functionName)
@ -812,6 +835,7 @@ string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
("minValue", toCompactHexWithPrefix(u256(_type.minValue()))) ("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
("cleanupFunction", cleanupFunction(_type)) ("cleanupFunction", cleanupFunction(_type))
("panic", panicFunction(PanicCode::UnderOverflow)) ("panic", panicFunction(PanicCode::UnderOverflow))
("256bit", _type.numBits() == 256)
.render(); .render();
}); });
} }

139
test/cmdlineTests/asm_json/output
View File

@ -1300,14 +1300,14 @@ EVM assembly:
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "tag", "name": "tag",
"source": 1, "source": 1,
"value": "10" "value": "10"
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "JUMPDEST", "name": "JUMPDEST",
"source": 1 "source": 1
}, },
@ -1423,159 +1423,146 @@ EVM assembly:
"source": 1 "source": 1
}, },
{ {
"begin": 1458, "begin": 1347,
"end": 1459, "end": 1348,
"name": "DUP3", "name": "DUP3",
"source": 1 "source": 1
}, },
{ {
"begin": 1390, "begin": 1344,
"end": 1456, "end": 1345,
"name": "PUSH",
"source": 1,
"value": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
},
{
"begin": 1386,
"end": 1460,
"name": "SUB",
"source": 1
},
{
"begin": 1383,
"end": 1384,
"name": "DUP3", "name": "DUP3",
"source": 1 "source": 1
}, },
{ {
"begin": 1380, "begin": 1340,
"end": 1461, "end": 1349,
"name": "ADD",
"source": 1
},
{
"begin": 1333,
"end": 1349,
"name": "SWAP1",
"source": 1
},
{
"begin": 1333,
"end": 1349,
"name": "POP",
"source": 1
},
{
"begin": 1368,
"end": 1371,
"name": "DUP1",
"source": 1
},
{
"begin": 1365,
"end": 1366,
"name": "DUP3",
"source": 1
},
{
"begin": 1362,
"end": 1372,
"name": "GT", "name": "GT",
"source": 1 "source": 1
}, },
{ {
"begin": 1377, "begin": 1359,
"end": 1484, "end": 1395,
"name": "ISZERO", "name": "ISZERO",
"source": 1 "source": 1
}, },
{ {
"begin": 1377, "begin": 1359,
"end": 1484, "end": 1395,
"name": "PUSH [tag]", "name": "PUSH [tag]",
"source": 1, "source": 1,
"value": "37" "value": "37"
}, },
{ {
"begin": 1377, "begin": 1359,
"end": 1484, "end": 1395,
"name": "JUMPI", "name": "JUMPI",
"source": 1 "source": 1
}, },
{ {
"begin": 1464, "begin": 1375,
"end": 1482, "end": 1393,
"name": "PUSH [tag]", "name": "PUSH [tag]",
"source": 1, "source": 1,
"value": "38" "value": "38"
}, },
{ {
"begin": 1464, "begin": 1375,
"end": 1482, "end": 1393,
"name": "PUSH [tag]", "name": "PUSH [tag]",
"source": 1, "source": 1,
"value": "18" "value": "18"
}, },
{ {
"begin": 1464, "begin": 1375,
"end": 1482, "end": 1393,
"jumpType": "[in]", "jumpType": "[in]",
"name": "JUMP", "name": "JUMP",
"source": 1 "source": 1
}, },
{ {
"begin": 1464, "begin": 1375,
"end": 1482, "end": 1393,
"name": "tag", "name": "tag",
"source": 1, "source": 1,
"value": "38" "value": "38"
}, },
{ {
"begin": 1464, "begin": 1375,
"end": 1482, "end": 1393,
"name": "JUMPDEST", "name": "JUMPDEST",
"source": 1 "source": 1
}, },
{ {
"begin": 1377, "begin": 1359,
"end": 1484, "end": 1395,
"name": "tag", "name": "tag",
"source": 1, "source": 1,
"value": "37" "value": "37"
}, },
{ {
"begin": 1377, "begin": 1359,
"end": 1484, "end": 1395,
"name": "JUMPDEST", "name": "JUMPDEST",
"source": 1 "source": 1
}, },
{
"begin": 1508,
"end": 1509,
"name": "DUP3",
"source": 1
},
{
"begin": 1505,
"end": 1506,
"name": "DUP3",
"source": 1
},
{
"begin": 1501,
"end": 1510,
"name": "ADD",
"source": 1
},
{
"begin": 1494,
"end": 1510,
"name": "SWAP1",
"source": 1
},
{
"begin": 1494,
"end": 1510,
"name": "POP",
"source": 1
},
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "SWAP3", "name": "SWAP3",
"source": 1 "source": 1
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "SWAP2", "name": "SWAP2",
"source": 1 "source": 1
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "POP", "name": "POP",
"source": 1 "source": 1
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"name": "POP", "name": "POP",
"source": 1 "source": 1
}, },
{ {
"begin": 1211, "begin": 1211,
"end": 1516, "end": 1402,
"jumpType": "[out]", "jumpType": "[out]",
"name": "JUMP", "name": "JUMP",
"source": 1 "source": 1

2
test/cmdlineTests/asm_json_no_pretty_print/output
View File

File diff suppressed because one or more lines are too long

7
test/cmdlineTests/optimizer_array_sload/output
View File

@ -49,16 +49,17 @@ object "Arraysum_34" {
{ {
/// @src 0:80:429 "contract Arraysum {..." /// @src 0:80:429 "contract Arraysum {..."
mstore(_2, _2) mstore(_2, _2)
let _4 := sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)) let sum := add(var_sum, sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)))
if gt(var_sum, not(_4)) if gt(var_sum, sum)
{ {
mstore(_2, shl(224, 0x4e487b71)) mstore(_2, shl(224, 0x4e487b71))
mstore(_1, 0x11) mstore(_1, 0x11)
revert(_2, 0x24) revert(_2, 0x24)
} }
/// @src 0:407:423 "sum += values[i]" /// @src 0:407:423 "sum += values[i]"
var_sum := /** @src 0:80:429 "contract Arraysum {..." */ add(var_sum, _4) var_sum := sum
} }
/// @src 0:80:429 "contract Arraysum {..."
let memPos := mload(64) let memPos := mload(64)
mstore(memPos, var_sum) mstore(memPos, var_sum)
return(memPos, 32) return(memPos, 32)

72
test/cmdlineTests/optimizer_inliner_dynamic_reference/output
View File

@ -150,75 +150,73 @@ sub_0: assembly {
jump // in jump // in
tag_25: tag_25:
jump // out jump // out
/* "#utility.yul":196:421 */ /* "#utility.yul":196:418 */
tag_22: tag_22:
/* "#utility.yul":236:239 */ /* "#utility.yul":261:270 */
0x00 dup1
/* "#utility.yul":267:268 */
dup3 dup3
/* "#utility.yul":263:269 */ add
not /* "#utility.yul":282:292 */
/* "#utility.yul":260:261 */ dup1
dup3 dup3
/* "#utility.yul":257:270 */
gt gt
/* "#utility.yul":254:390 */ /* "#utility.yul":279:412 */
iszero iszero
tag_30 tag_30
jumpi jumpi
/* "#utility.yul":312:322 */ /* "#utility.yul":334:344 */
0x4e487b71 0x4e487b71
/* "#utility.yul":307:310 */ /* "#utility.yul":329:332 */
0xe0 0xe0
/* "#utility.yul":303:323 */ /* "#utility.yul":325:345 */
shl shl
/* "#utility.yul":300:301 */ /* "#utility.yul":322:323 */
0x00 0x00
/* "#utility.yul":293:324 */ /* "#utility.yul":315:346 */
mstore mstore
/* "#utility.yul":347:351 */ /* "#utility.yul":369:373 */
0x11 0x11
/* "#utility.yul":344:345 */ /* "#utility.yul":366:367 */
0x04 0x04
/* "#utility.yul":337:352 */ /* "#utility.yul":359:374 */
mstore mstore
/* "#utility.yul":375:379 */ /* "#utility.yul":397:401 */
0x24 0x24
/* "#utility.yul":372:373 */ /* "#utility.yul":394:395 */
0x00 0x00
/* "#utility.yul":365:380 */ /* "#utility.yul":387:402 */
revert revert
/* "#utility.yul":254:390 */ /* "#utility.yul":279:412 */
tag_30: tag_30:
/* "#utility.yul":196:418 */
swap3
swap2
pop
pop pop
/* "#utility.yul":406:415 */
add
swap1
/* "#utility.yul":196:421 */
jump // out jump // out
/* "#utility.yul":426:553 */ /* "#utility.yul":423:550 */
tag_26: tag_26:
/* "#utility.yul":487:497 */ /* "#utility.yul":484:494 */
0x4e487b71 0x4e487b71
/* "#utility.yul":482:485 */ /* "#utility.yul":479:482 */
0xe0 0xe0
/* "#utility.yul":478:498 */ /* "#utility.yul":475:495 */
shl shl
/* "#utility.yul":475:476 */ /* "#utility.yul":472:473 */
0x00 0x00
/* "#utility.yul":468:499 */ /* "#utility.yul":465:496 */
mstore mstore
/* "#utility.yul":518:522 */ /* "#utility.yul":515:519 */
0x51 0x51
/* "#utility.yul":515:516 */ /* "#utility.yul":512:513 */
0x04 0x04
/* "#utility.yul":508:523 */ /* "#utility.yul":505:520 */
mstore mstore
/* "#utility.yul":542:546 */ /* "#utility.yul":539:543 */
0x24 0x24
/* "#utility.yul":539:540 */ /* "#utility.yul":536:537 */
0x00 0x00
/* "#utility.yul":532:547 */ /* "#utility.yul":529:544 */
revert revert
auxdata: <AUXDATA REMOVED> auxdata: <AUXDATA REMOVED>

72
test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
View File

@ -155,75 +155,73 @@ sub_0: assembly {
jump // in jump // in
tag_21: tag_21:
jump // out jump // out
/* "#utility.yul":196:421 */ /* "#utility.yul":196:418 */
tag_19: tag_19:
/* "#utility.yul":236:239 */ /* "#utility.yul":261:270 */
0x00 dup1
/* "#utility.yul":267:268 */
dup3 dup3
/* "#utility.yul":263:269 */ add
not /* "#utility.yul":282:292 */
/* "#utility.yul":260:261 */ dup1
dup3 dup3
/* "#utility.yul":257:270 */
gt gt
/* "#utility.yul":254:390 */ /* "#utility.yul":279:412 */
iszero iszero
tag_26 tag_26
jumpi jumpi
/* "#utility.yul":312:322 */ /* "#utility.yul":334:344 */
0x4e487b71 0x4e487b71
/* "#utility.yul":307:310 */ /* "#utility.yul":329:332 */
0xe0 0xe0
/* "#utility.yul":303:323 */ /* "#utility.yul":325:345 */
shl shl
/* "#utility.yul":300:301 */ /* "#utility.yul":322:323 */
0x00 0x00
/* "#utility.yul":293:324 */ /* "#utility.yul":315:346 */
mstore mstore
/* "#utility.yul":347:351 */ /* "#utility.yul":369:373 */
0x11 0x11
/* "#utility.yul":344:345 */ /* "#utility.yul":366:367 */
0x04 0x04
/* "#utility.yul":337:352 */ /* "#utility.yul":359:374 */
mstore mstore
/* "#utility.yul":375:379 */ /* "#utility.yul":397:401 */
0x24 0x24
/* "#utility.yul":372:373 */ /* "#utility.yul":394:395 */
0x00 0x00
/* "#utility.yul":365:380 */ /* "#utility.yul":387:402 */
revert revert
/* "#utility.yul":254:390 */ /* "#utility.yul":279:412 */
tag_26: tag_26:
/* "#utility.yul":196:418 */
swap3
swap2
pop
pop pop
/* "#utility.yul":406:415 */
add
swap1
/* "#utility.yul":196:421 */
jump // out jump // out
/* "#utility.yul":426:553 */ /* "#utility.yul":423:550 */
tag_22: tag_22:
/* "#utility.yul":487:497 */ /* "#utility.yul":484:494 */
0x4e487b71 0x4e487b71
/* "#utility.yul":482:485 */ /* "#utility.yul":479:482 */
0xe0 0xe0
/* "#utility.yul":478:498 */ /* "#utility.yul":475:495 */
shl shl
/* "#utility.yul":475:476 */ /* "#utility.yul":472:473 */
0x00 0x00
/* "#utility.yul":468:499 */ /* "#utility.yul":465:496 */
mstore mstore
/* "#utility.yul":518:522 */ /* "#utility.yul":515:519 */
0x51 0x51
/* "#utility.yul":515:516 */ /* "#utility.yul":512:513 */
0x04 0x04
/* "#utility.yul":508:523 */ /* "#utility.yul":505:520 */
mstore mstore
/* "#utility.yul":542:546 */ /* "#utility.yul":539:543 */
0x24 0x24
/* "#utility.yul":539:540 */ /* "#utility.yul":536:537 */
0x00 0x00
/* "#utility.yul":532:547 */ /* "#utility.yul":529:544 */
revert revert
auxdata: <AUXDATA REMOVED> auxdata: <AUXDATA REMOVED>

113
test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
View File

@ -120,9 +120,7 @@ sub_0: assembly {
eq eq
tag_14 tag_14
jumpi jumpi
/* \"C\":117:119 41 */
0x01 0x01
/* \"C\":79:428 contract C... */
add add
swap2 swap2
dup3 dup3
@ -312,54 +310,51 @@ sub_0: assembly {
jumpi jumpi
/* \"C\":290:298 immutVar */ /* \"C\":290:298 immutVar */
immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\") immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
sub(shl(0xff, 0x01), 0x2a)
/* \"C\":117:119 41 */ /* \"C\":117:119 41 */
dup1
0x29
add
swap1
dup2 dup2
sgt slt
0x01 0x01
and and
tag_14 tag_14
jumpi jumpi
/* \"C\":79:428 contract C... */ /* \"C\":79:428 contract C... */
0x20 0x20
/* \"C\":117:119 41 */
swap3 swap3
pop pop
0x29
add
/* \"C\":79:428 contract C... */
dup2 dup2
mstore mstore
return return
/* \"C\":117:119 41 */ /* \"C\":117:119 41 */
tag_1: tag_1:
swap2
swap1
swap2
0x00 0x00
dup2 dup4
dup3
add
swap4
dup5
slt slt
swap2
slt
swap1
dup1 dup1
iszero iszero
sub(shl(0xff, 0x01), 0x01)
dup4
swap1
sub
dup5
sgt
and
tag_40
jumpi
shl(0xff, 0x01)
dup3 dup3
swap1
sub
dup4
slt
and and
tag_40 swap2
iszero
and
or
tag_38
jumpi jumpi
add
swap1
jump\t// out jump\t// out
tag_40: tag_38:
mstore(0x00, shl(0xe0, 0x4e487b71)) mstore(0x00, shl(0xe0, 0x4e487b71))
mstore(0x04, 0x11) mstore(0x04, 0x11)
revert(0x00, 0x24) revert(0x00, 0x24)
@ -410,18 +405,19 @@ sub_0: assembly {
mload mload
/* \"C\":147:149 42 */ /* \"C\":147:149 42 */
mstore(0x80, 0x2a) mstore(0x80, 0x2a)
sub(shl(0xff, 0x01), 0x04)
/* \"D\":91:166 contract D is C(3)... */ /* \"D\":91:166 contract D is C(3)... */
dup2 dup1
sgt
0x01
and
tag_7
jumpi
/* \"D\":107:108 3 */ /* \"D\":107:108 3 */
0x03 0x03
/* \"D\":91:166 contract D is C(3)... */ /* \"D\":91:166 contract D is C(3)... */
add add
swap1
dup2
slt
0x01
and
tag_7
jumpi
0x00 0x00
sstore sstore
mload(0x40) mload(0x40)
@ -503,9 +499,7 @@ sub_0: assembly {
eq eq
tag_14 tag_14
jumpi jumpi
/* \"C\":117:119 41 */
0x01 0x01
/* \"D\":91:166 contract D is C(3)... */
add add
swap2 swap2
dup3 dup3
@ -695,54 +689,51 @@ sub_0: assembly {
jumpi jumpi
/* \"C\":290:298 immutVar */ /* \"C\":290:298 immutVar */
immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\") immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
sub(shl(0xff, 0x01), 0x2a)
/* \"C\":117:119 41 */ /* \"C\":117:119 41 */
dup1
0x29
add
swap1
dup2 dup2
sgt slt
0x01 0x01
and and
tag_14 tag_14
jumpi jumpi
/* \"D\":91:166 contract D is C(3)... */ /* \"D\":91:166 contract D is C(3)... */
0x20 0x20
/* \"C\":117:119 41 */
swap3 swap3
pop pop
0x29
add
/* \"D\":91:166 contract D is C(3)... */
dup2 dup2
mstore mstore
return return
/* \"C\":117:119 41 */ /* \"C\":117:119 41 */
tag_1: tag_1:
swap2
swap1
swap2
0x00 0x00
dup2 dup4
dup3
add
swap4
dup5
slt slt
swap2
slt
swap1
dup1 dup1
iszero iszero
sub(shl(0xff, 0x01), 0x01)
dup4
swap1
sub
dup5
sgt
and
tag_40
jumpi
shl(0xff, 0x01)
dup3 dup3
swap1
sub
dup4
slt
and and
tag_40 swap2
iszero
and
or
tag_38
jumpi jumpi
add
swap1
jump\t// out jump\t// out
tag_40: tag_38:
mstore(0x00, shl(0xe0, 0x4e487b71)) mstore(0x00, shl(0xe0, 0x4e487b71))
mstore(0x04, 0x11) mstore(0x04, 0x11)
revert(0x00, 0x24) revert(0x00, 0x24)

99
test/cmdlineTests/standard_debug_info_in_yul_location/output.json
View File

@ -354,13 +354,15 @@ object \"C_54\" {
function checked_add_t_int256(x, y) -> sum { function checked_add_t_int256(x, y) -> sum {
x := cleanup_t_int256(x) x := cleanup_t_int256(x)
y := cleanup_t_int256(y) y := cleanup_t_int256(y)
// overflow, if x >= 0 and y > (maxValue - x)
if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
// underflow, if x < 0 and y < (minValue - x)
if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
sum := add(x, y) sum := add(x, y)
// overflow, if x >= 0 and sum < y
// underflow, if x < 0 and sum >= y
if or(
and(iszero(slt(x, 0)), slt(sum, y)),
and(slt(x, 0), iszero(slt(sum, y)))
) { panic_error_0x11() }
} }
/// @ast-id 30 /// @ast-id 30
@ -656,13 +658,14 @@ object \"C_54\" {
/// @src 0:297:305 \"immutVar\" /// @src 0:297:305 \"immutVar\"
let _4 := loadimmutable(\"8\") let _4 := loadimmutable(\"8\")
/// @src 0:79:435 \"contract C...\" /// @src 0:79:435 \"contract C...\"
if and(1, sgt(_4, sub(shl(255, 1), 42))) let sum := add(/** @src 0:124:126 \"41\" */ 0x29, /** @src 0:79:435 \"contract C...\" */ _4)
if and(1, slt(sum, _4))
{ {
mstore(_3, shl(224, 0x4e487b71)) mstore(_3, shl(224, 0x4e487b71))
mstore(4, 0x11) mstore(4, 0x11)
revert(_3, 0x24) revert(_3, 0x24)
} }
mstore(_1, add(/** @src 0:124:126 \"41\" */ 0x29, /** @src 0:79:435 \"contract C...\" */ _4)) mstore(_1, sum)
return(_1, 32) return(_1, 32)
} }
case 0x793816ec { case 0x793816ec {
@ -742,20 +745,15 @@ object \"C_54\" {
} }
function checked_add_int256(x, y) -> sum function checked_add_int256(x, y) -> sum
{ {
let _1 := slt(x, 0)
if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
if and(_1, slt(y, sub(shl(255, 1), x)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
sum := add(x, y) sum := add(x, y)
let _1 := slt(sum, y)
let _2 := slt(x, 0)
if or(and(iszero(_2), _1), and(_2, iszero(_1)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
} }
} }
data \".metadata\" hex\"<BYTECODE REMOVED>\" data \".metadata\" hex\"<BYTECODE REMOVED>\"
@ -893,13 +891,15 @@ object \"D_72\" {
function checked_add_t_int256(x, y) -> sum { function checked_add_t_int256(x, y) -> sum {
x := cleanup_t_int256(x) x := cleanup_t_int256(x)
y := cleanup_t_int256(y) y := cleanup_t_int256(y)
// overflow, if x >= 0 and y > (maxValue - x)
if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
// underflow, if x < 0 and y < (minValue - x)
if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
sum := add(x, y) sum := add(x, y)
// overflow, if x >= 0 and sum < y
// underflow, if x < 0 and sum >= y
if or(
and(iszero(slt(x, 0)), slt(sum, y)),
and(slt(x, 0), iszero(slt(sum, y)))
) { panic_error_0x11() }
} }
function shift_left_0(value) -> newValue { function shift_left_0(value) -> newValue {
@ -1185,13 +1185,15 @@ object \"D_72\" {
function checked_add_t_int256(x, y) -> sum { function checked_add_t_int256(x, y) -> sum {
x := cleanup_t_int256(x) x := cleanup_t_int256(x)
y := cleanup_t_int256(y) y := cleanup_t_int256(y)
// overflow, if x >= 0 and y > (maxValue - x)
if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
// underflow, if x < 0 and y < (minValue - x)
if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
sum := add(x, y) sum := add(x, y)
// overflow, if x >= 0 and sum < y
// underflow, if x < 0 and sum >= y
if or(
and(iszero(slt(x, 0)), slt(sum, y)),
and(slt(x, 0), iszero(slt(sum, y)))
) { panic_error_0x11() }
} }
/// @ast-id 30 /// @ast-id 30
@ -1460,13 +1462,14 @@ object \"D_72\" {
/// @src 0:154:156 \"42\" /// @src 0:154:156 \"42\"
mstore(128, 0x2a) mstore(128, 0x2a)
/// @src 1:91:166 \"contract D is C(3)...\" /// @src 1:91:166 \"contract D is C(3)...\"
if and(1, sgt(value, sub(shl(255, 1), 4))) let sum := add(/** @src 1:107:108 \"3\" */ 0x03, /** @src 1:91:166 \"contract D is C(3)...\" */ value)
if and(1, slt(sum, value))
{ {
mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71)) mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
mstore(4, 0x11) mstore(4, 0x11)
revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24) revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24)
} }
sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ add(/** @src 1:107:108 \"3\" */ 0x03, /** @src 1:91:166 \"contract D is C(3)...\" */ value)) sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166 \"contract D is C(3)...\" */ sum)
let _2 := mload(64) let _2 := mload(64)
let _3 := datasize(\"D_72_deployed\") let _3 := datasize(\"D_72_deployed\")
codecopy(_2, dataoffset(\"D_72_deployed\"), _3) codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
@ -1493,13 +1496,14 @@ object \"D_72\" {
/// @src 0:297:305 \"immutVar\" /// @src 0:297:305 \"immutVar\"
let _4 := loadimmutable(\"8\") let _4 := loadimmutable(\"8\")
/// @src 1:91:166 \"contract D is C(3)...\" /// @src 1:91:166 \"contract D is C(3)...\"
if and(1, sgt(_4, sub(shl(255, 1), 42))) let sum := add(/** @src 0:124:126 \"41\" */ 0x29, /** @src 1:91:166 \"contract D is C(3)...\" */ _4)
if and(1, slt(sum, _4))
{ {
mstore(_3, shl(224, 0x4e487b71)) mstore(_3, shl(224, 0x4e487b71))
mstore(4, 0x11) mstore(4, 0x11)
revert(_3, 0x24) revert(_3, 0x24)
} }
mstore(_1, add(/** @src 0:124:126 \"41\" */ 0x29, /** @src 1:91:166 \"contract D is C(3)...\" */ _4)) mstore(_1, sum)
return(_1, 32) return(_1, 32)
} }
case 0x793816ec { case 0x793816ec {
@ -1579,20 +1583,15 @@ object \"D_72\" {
} }
function checked_add_int256(x, y) -> sum function checked_add_int256(x, y) -> sum
{ {
let _1 := slt(x, 0)
if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
if and(_1, slt(y, sub(shl(255, 1), x)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
sum := add(x, y) sum := add(x, y)
let _1 := slt(sum, y)
let _2 := slt(x, 0)
if or(and(iszero(_2), _1), and(_2, iszero(_1)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(0, 0x24)
}
} }
} }
data \".metadata\" hex\"<BYTECODE REMOVED>\" data \".metadata\" hex\"<BYTECODE REMOVED>\"

15
test/formal/checked_int_add.py
View File

@ -1,4 +1,4 @@
from opcodes import AND, ISZERO, SGT, SLT, SUB from opcodes import AND, ISZERO, SGT, SLT, ADD
from rule import Rule from rule import Rule
from util import BVSignedMax, BVSignedMin, BVSignedUpCast from util import BVSignedMax, BVSignedMin, BVSignedUpCast
from z3 import BitVec, BVAddNoOverflow, BVAddNoUnderflow, Not from z3 import BitVec, BVAddNoOverflow, BVAddNoUnderflow, Not
@ -25,16 +25,21 @@ while type_bits <= n_bits:
# cast to full n_bits values # cast to full n_bits values
X = BVSignedUpCast(X_short, n_bits) X = BVSignedUpCast(X_short, n_bits)
Y = BVSignedUpCast(Y_short, n_bits) Y = BVSignedUpCast(Y_short, n_bits)
sum_ = ADD(X, Y)
# Constants # Constants
maxValue = BVSignedMax(type_bits, n_bits) maxValue = BVSignedMax(type_bits, n_bits)
minValue = BVSignedMin(type_bits, n_bits) minValue = BVSignedMin(type_bits, n_bits)
# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntAddFunction # Overflow and underflow checks in YulUtilFunction::overflowCheckedIntAddFunction
overflow_check = AND(ISZERO(SLT(X, 0)), SGT(Y, SUB(maxValue, X))) if type_bits == 256:
underflow_check = AND(SLT(X, 0), SLT(Y, SUB(minValue, X))) overflow_check = AND(ISZERO(SLT(X, 0)), SLT(sum_, Y))
underflow_check = AND(SLT(X, 0), ISZERO(SLT(sum_, Y)))
else:
overflow_check = SGT(sum_, maxValue)
underflow_check = SLT(sum_, minValue)
type_bits += 8
rule.check(actual_overflow, overflow_check != 0) rule.check(actual_overflow, overflow_check != 0)
rule.check(actual_underflow, underflow_check != 0) rule.check(actual_underflow, underflow_check != 0)
type_bits *= 2

15
test/formal/checked_int_sub.py
View File

@ -1,4 +1,4 @@
from opcodes import AND, ADD, ISZERO, SLT, SGT from opcodes import AND, ISZERO, SLT, SGT, SUB
from rule import Rule from rule import Rule
from util import BVSignedMax, BVSignedMin, BVSignedUpCast from util import BVSignedMax, BVSignedMin, BVSignedUpCast
from z3 import BitVec, BVSubNoOverflow, BVSubNoUnderflow, Not from z3 import BitVec, BVSubNoOverflow, BVSubNoUnderflow, Not
@ -25,16 +25,21 @@ while type_bits <= n_bits:
# cast to full n_bits values # cast to full n_bits values
X = BVSignedUpCast(X_short, n_bits) X = BVSignedUpCast(X_short, n_bits)
Y = BVSignedUpCast(Y_short, n_bits) Y = BVSignedUpCast(Y_short, n_bits)
diff = SUB(X, Y)
# Constants # Constants
maxValue = BVSignedMax(type_bits, n_bits) maxValue = BVSignedMax(type_bits, n_bits)
minValue = BVSignedMin(type_bits, n_bits) minValue = BVSignedMin(type_bits, n_bits)
# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntSubFunction # Overflow and underflow checks in YulUtilFunction::overflowCheckedIntSubFunction
underflow_check = AND(ISZERO(SLT(Y, 0)), SLT(X, ADD(minValue, Y))) if type_bits == 256:
overflow_check = AND(SLT(Y, 0), SGT(X, ADD(maxValue, Y))) underflow_check = AND(ISZERO(SLT(Y, 0)), SGT(diff, X))
overflow_check = AND(SLT(Y, 0), SLT(diff, X))
else:
underflow_check = SLT(diff, minValue)
overflow_check = SGT(diff, maxValue)
type_bits += 8
rule.check(actual_underflow, underflow_check != 0) rule.check(actual_underflow, underflow_check != 0)
rule.check(actual_overflow, overflow_check != 0) rule.check(actual_overflow, overflow_check != 0)
type_bits *= 2

12
test/formal/checked_uint_add.py
View File

@ -1,4 +1,4 @@
from opcodes import GT, SUB from opcodes import GT, ADD
from rule import Rule from rule import Rule
from util import BVUnsignedMax, BVUnsignedUpCast from util import BVUnsignedMax, BVUnsignedUpCast
from z3 import BitVec, BVAddNoOverflow, Not from z3 import BitVec, BVAddNoOverflow, Not
@ -24,13 +24,17 @@ while type_bits <= n_bits:
# cast to full n_bits values # cast to full n_bits values
X = BVUnsignedUpCast(X_short, n_bits) X = BVUnsignedUpCast(X_short, n_bits)
Y = BVUnsignedUpCast(Y_short, n_bits) Y = BVUnsignedUpCast(Y_short, n_bits)
sum_ = ADD(X, Y)
# Constants # Constants
maxValue = BVUnsignedMax(type_bits, n_bits) maxValue = BVUnsignedMax(type_bits, n_bits)
# Overflow check in YulUtilFunction::overflowCheckedIntAddFunction # Overflow check in YulUtilFunction::overflowCheckedIntAddFunction
overflow_check = GT(X, SUB(maxValue, Y)) if type_bits == 256:
overflow_check = GT(X, sum_)
else:
overflow_check = GT(sum_, maxValue)
type_bits += 8
rule.check(overflow_check != 0, actual_overflow) rule.check(overflow_check != 0, actual_overflow)
type_bits *= 2

12
test/formal/checked_uint_sub.py
View File

@ -1,4 +1,4 @@
from opcodes import LT from opcodes import SUB, GT
from rule import Rule from rule import Rule
from util import BVUnsignedMax, BVUnsignedUpCast from util import BVUnsignedMax, BVUnsignedUpCast
from z3 import BVSubNoUnderflow, BitVec, Not from z3 import BVSubNoUnderflow, BitVec, Not
@ -24,13 +24,17 @@ while type_bits <= n_bits:
# cast to full n_bits values # cast to full n_bits values
X = BVUnsignedUpCast(X_short, n_bits) X = BVUnsignedUpCast(X_short, n_bits)
Y = BVUnsignedUpCast(Y_short, n_bits) Y = BVUnsignedUpCast(Y_short, n_bits)
diff = SUB(X, Y)
# Constants # Constants
maxValue = BVUnsignedMax(type_bits, n_bits) maxValue = BVUnsignedMax(type_bits, n_bits)
# Overflow check in YulUtilFunction::overflowCheckedIntSubFunction # Overflow check in YulUtilFunction::overflowCheckedIntSubFunction
overflow_check = LT(X, Y) if type_bits == 256:
overflow_check = GT(diff, X)
else:
overflow_check = GT(diff, maxValue)
type_bits += 8
rule.check(overflow_check != 0, actual_overflow) rule.check(overflow_check != 0, actual_overflow)
type_bits *= 2

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

@ -19,6 +19,6 @@ contract c {
// compileToEwasm: also // compileToEwasm: also
// ---- // ----
// test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
// gas irOptimized: 124757 // gas irOptimized: 124817
// gas legacy: 186184 // gas legacy: 186028
// gas legacyOptimized: 165682 // gas legacyOptimized: 165692

8
test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
View File

@ -38,10 +38,10 @@ contract c {
// compileViaYul: true // compileViaYul: true
// ---- // ----
// test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
// gas irOptimized: 180766 // gas irOptimized: 180769
// test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
// gas irOptimized: 157564 // gas irOptimized: 157567
// test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
// gas irOptimized: 134630 // gas irOptimized: 134633
// test4(uint256[2][2]): 23, 42, 23, 42 -> 65 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
// gas irOptimized: 111268 // gas irOptimized: 111271

12
test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
View File

@ -38,12 +38,12 @@ contract Test {
} }
// ---- // ----
// test() -> 24 // test() -> 24
// gas irOptimized: 226694 // gas irOptimized: 226700
// gas legacy: 227133 // gas legacy: 227121
// gas legacyOptimized: 226547 // gas legacyOptimized: 226557
// test1() -> 3 // test1() -> 3
// test2() -> 6 // test2() -> 6
// test3() -> 24 // test3() -> 24
// gas irOptimized: 133254 // gas irOptimized: 133260
// gas legacy: 134295 // gas legacy: 134283
// gas legacyOptimized: 133383 // gas legacyOptimized: 133393

6
test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
View File

@ -14,9 +14,9 @@ contract c {
// ---- // ----
// storageEmpty -> 1 // storageEmpty -> 1
// fill() -> // fill() ->
// gas irOptimized: 519616 // gas irOptimized: 519490
// gas legacy: 521710 // gas legacy: 521584
// gas legacyOptimized: 516922 // gas legacyOptimized: 517027
// storageEmpty -> 0 // storageEmpty -> 0
// halfClear() -> // halfClear() ->
// storageEmpty -> 0 // storageEmpty -> 0

6
test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
View File

@ -12,9 +12,9 @@ contract c {
// ---- // ----
// storageEmpty -> 1 // storageEmpty -> 1
// fill() -> // fill() ->
// gas irOptimized: 465440 // gas irOptimized: 465380
// gas legacy: 471400 // gas legacy: 471280
// gas legacyOptimized: 467400 // gas legacyOptimized: 467500
// storageEmpty -> 0 // storageEmpty -> 0
// clear() -> // clear() ->
// storageEmpty -> 1 // storageEmpty -> 1

4
test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
View File

@ -23,7 +23,7 @@ contract c {
} }
// ---- // ----
// test() -> 1, 2, 3 // test() -> 1, 2, 3
// gas irOptimized: 2280132 // gas irOptimized: 2280147
// gas legacy: 2273434 // gas legacy: 2273434
// gas legacyOptimized: 2261820 // gas legacyOptimized: 2261844
// storageEmpty -> 1 // storageEmpty -> 1

4
test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
View File

@ -18,7 +18,7 @@ contract c {
} }
// ---- // ----
// test() -> 38, 28, 18 // test() -> 38, 28, 18
// gas irOptimized: 186364 // gas irOptimized: 186370
// gas legacy: 189492 // gas legacy: 189492
// gas legacyOptimized: 178294 // gas legacyOptimized: 178318
// storageEmpty -> 1 // storageEmpty -> 1

4
test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
View File

@ -18,7 +18,7 @@ contract c {
} }
// ---- // ----
// test() -> 20, 10 // test() -> 20, 10
// gas irOptimized: 158009 // gas irOptimized: 158020
// gas legacy: 159279 // gas legacy: 159279
// gas legacyOptimized: 152921 // gas legacyOptimized: 152937
// storageEmpty -> 1 // storageEmpty -> 1

6
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
View File

@ -16,7 +16,7 @@ contract c {
} }
// ---- // ----
// test() -> true // test() -> true
// gas irOptimized: 180539 // gas irOptimized: 176111
// gas legacy: 228685 // gas legacy: 224093
// gas legacyOptimized: 209662 // gas legacyOptimized: 205152
// storageEmpty -> 1 // storageEmpty -> 1

4
test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
View File

@ -15,6 +15,6 @@ contract c {
} }
// ---- // ----
// test() -> 0 // test() -> 0
// gas irOptimized: 173650 // gas irOptimized: 174126
// gas legacy: 216790 // gas legacy: 216790
// gas legacyOptimized: 203886 // gas legacyOptimized: 204003

6
test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
View File

@ -21,9 +21,9 @@ contract D is B, C {
} }
// ---- // ----
// constructor(): 2, 0 -> // constructor(): 2, 0 ->
// gas irOptimized: 154366 // gas irOptimized: 154331
// gas legacy: 170665 // gas legacy: 170115
// gas legacyOptimized: 145396 // gas legacyOptimized: 145429
// i() -> 2 // i() -> 2
// j() -> 2 // j() -> 2
// k() -> 1 // k() -> 1

6
test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
View File

@ -12,8 +12,8 @@ contract D is C {
} }
// ---- // ----
// constructor(): 2, 0 -> // constructor(): 2, 0 ->
// gas irOptimized: 123982 // gas irOptimized: 123966
// gas legacy: 139250 // gas legacy: 138700
// gas legacyOptimized: 119367 // gas legacyOptimized: 119400
// i() -> 2 // i() -> 2
// k() -> 1 // k() -> 1

6
test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
View File

@ -13,6 +13,6 @@ contract C {
// ---- // ----
// createEvent(uint256): 42 -> // createEvent(uint256): 42 ->
// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
// gas irOptimized: 113517 // gas irOptimized: 113514
// gas legacy: 116393 // gas legacy: 116381
// gas legacyOptimized: 114415 // gas legacyOptimized: 114425

6
test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
View File

@ -14,6 +14,6 @@ contract C {
// ---- // ----
// createEvent(uint256): 42 -> // createEvent(uint256): 42 ->
// ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
// gas irOptimized: 113517 // gas irOptimized: 113514
// gas legacy: 116393 // gas legacy: 116381
// gas legacyOptimized: 114415 // gas legacyOptimized: 114425

4
test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
View File

@ -16,5 +16,5 @@ contract C {
// createEvent(uint256): 42 -> // createEvent(uint256): 42 ->
// ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
// gas irOptimized: 185145 // gas irOptimized: 185145
// gas legacy: 187621 // gas legacy: 187603
// gas legacyOptimized: 184551 // gas legacyOptimized: 184566

18
test/libsolidity/semanticTests/externalContracts/base64.sol
View File

@ -33,9 +33,9 @@ contract test {
// EVMVersion: >=constantinople // EVMVersion: >=constantinople
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 443542 // gas irOptimized: 444190
// gas legacy: 765640 // gas legacy: 757857
// gas legacyOptimized: 541810 // gas legacyOptimized: 539866
// encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
// encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg==" // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8=" // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@ -51,10 +51,10 @@ contract test {
// encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE=" // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
// encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy" // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
// encode_inline_asm_large() // encode_inline_asm_large()
// gas irOptimized: 1385042 // gas irOptimized: 1382042
// gas legacy: 1652033 // gas legacy: 1646033
// gas legacyOptimized: 1201033 // gas legacyOptimized: 1206033
// encode_no_asm_large() // encode_no_asm_large()
// gas irOptimized: 3335099 // gas irOptimized: 3311099
// gas legacy: 4777077 // gas legacy: 4723077
// gas legacyOptimized: 2890077 // gas legacyOptimized: 2909077

6
test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
View File

@ -176,9 +176,9 @@ contract DepositContract is IDepositContract, ERC165 {
} }
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 1433406 // gas irOptimized: 1432633
// gas legacy: 2435803 // gas legacy: 2427722
// gas legacyOptimized: 1775425 // gas legacyOptimized: 1773892
// supportsInterface(bytes4): 0x0 -> 0 // supportsInterface(bytes4): 0x0 -> 0
// supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 # // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
// supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id # // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #

6
test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
View File

@ -48,9 +48,9 @@ contract test {
} }
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 1878547 // gas irOptimized: 1876171
// gas legacy: 2478955 // gas legacy: 2471603
// gas legacyOptimized: 1877737 // gas legacyOptimized: 1876669
// div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
// gas irOptimized: 22137 // gas irOptimized: 22137
// gas legacy: 22767 // gas legacy: 22767

6
test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
View File

@ -48,9 +48,9 @@ contract test {
} }
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 1737100 // gas irOptimized: 1735588
// gas legacy: 2248594 // gas legacy: 2241243
// gas legacyOptimized: 1749096 // gas legacyOptimized: 1748028
// div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
// gas irOptimized: 22004 // gas irOptimized: 22004
// gas legacy: 22497 // gas legacy: 22497

6
test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
View File

@ -33,9 +33,9 @@ contract test {
} }
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 438112 // gas irOptimized: 422763
// gas legacy: 671453 // gas legacy: 654526
// gas legacyOptimized: 480242 // gas legacyOptimized: 474842
// prb_pi() -> 3141592656369545286 // prb_pi() -> 3141592656369545286
// gas irOptimized: 57478 // gas irOptimized: 57478
// gas legacy: 98903 // gas legacy: 98903

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

@ -297,5 +297,5 @@ contract Test {
// verifyTx() -> true // verifyTx() -> true
// ~ emit Verified(string): 0x20, 0x16, "Successfully verified." // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
// gas irOptimized: 95261 // gas irOptimized: 95261
// gas legacy: 113731 // gas legacy: 113239
// gas legacyOptimized: 83670 // gas legacyOptimized: 83670

12
test/libsolidity/semanticTests/externalContracts/strings.sol
View File

@ -49,9 +49,9 @@ contract test {
} }
// ---- // ----
// constructor() // constructor()
// gas irOptimized: 691317 // gas irOptimized: 678980
// gas legacy: 1127730 // gas legacy: 1103242
// gas legacyOptimized: 753807 // gas legacyOptimized: 745184
// toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
// gas irOptimized: 22660 // gas irOptimized: 22660
// gas legacy: 23190 // gas legacy: 23190
@ -69,6 +69,6 @@ contract test {
// gas legacy: 31621 // gas legacy: 31621
// gas legacyOptimized: 27914 // gas legacyOptimized: 27914
// benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
// gas irOptimized: 2040019 // gas irOptimized: 2017767
// gas legacy: 4356286 // gas legacy: 4294510
// gas legacyOptimized: 2268278 // gas legacyOptimized: 2327982

6
test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
View File

@ -23,9 +23,9 @@ contract C {
// ---- // ----
// constructor(), 1 ether -> // constructor(), 1 ether ->
// gas irOptimized: 270677 // gas irOptimized: 270449
// gas legacy: 464030 // gas legacy: 456680
// gas legacyOptimized: 304049 // gas legacyOptimized: 302975
// f(uint256): 0 -> FAILURE // f(uint256): 0 -> FAILURE
// f(uint256): 1 -> FAILURE // f(uint256): 1 -> FAILURE
// f(uint256): 2 -> FAILURE // f(uint256): 2 -> FAILURE

6
test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
View File

@ -26,9 +26,9 @@ contract C {
// revertStrings: debug // revertStrings: debug
// ---- // ----
// constructor(), 1 ether -> // constructor(), 1 ether ->
// gas irOptimized: 428679 // gas irOptimized: 428444
// gas legacy: 832976 // gas legacy: 825625
// gas legacyOptimized: 509560 // gas legacyOptimized: 508492
// f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
// f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
// f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code" // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"

6
test/libsolidity/semanticTests/functionCall/failed_create.sol
View File

@ -17,9 +17,9 @@ contract C {
// EVMVersion: >=byzantium // EVMVersion: >=byzantium
// ---- // ----
// constructor(), 20 wei // constructor(), 20 wei
// gas irOptimized: 184221 // gas irOptimized: 184005
// gas legacy: 294335 // gas legacy: 294335
// gas legacyOptimized: 174279 // gas legacyOptimized: 173427
// f(uint256): 20 -> 1370859564726510389319704988634906228201275401179 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
// x() -> 1 // x() -> 1
// f(uint256): 20 -> FAILURE // f(uint256): 20 -> FAILURE
@ -27,7 +27,7 @@ contract C {
// stack(uint256): 1023 -> FAILURE // stack(uint256): 1023 -> FAILURE
// gas irOptimized: 260987 // gas irOptimized: 260987
// gas legacy: 483942 // gas legacy: 483942
// gas legacyOptimized: 298807 // gas legacyOptimized: 302349
// x() -> 1 // x() -> 1
// stack(uint256): 10 -> 693016686122178122849713379390321835634789309880 // stack(uint256): 10 -> 693016686122178122849713379390321835634789309880
// x() -> 2 // x() -> 2

4
test/libsolidity/semanticTests/functionTypes/store_function.sol
View File

@ -27,5 +27,5 @@ contract C {
// ---- // ----
// t() -> 9 // t() -> 9
// gas irOptimized: 99064 // gas irOptimized: 99064
// gas legacy: 158955 // gas legacy: 152137
// gas legacyOptimized: 108788 // gas legacyOptimized: 107793

4
test/libsolidity/semanticTests/immutable/use_scratch.sol
View File

@ -16,7 +16,7 @@ contract C {
// ---- // ----
// constructor(): 3 -> // constructor(): 3 ->
// gas irOptimized: 125477 // gas irOptimized: 125477
// gas legacy: 209361 // gas legacy: 202011
// gas legacyOptimized: 139324 // gas legacyOptimized: 139552
// f() -> 84, 23 // f() -> 84, 23
// m(uint256): 3 -> 7 // m(uint256): 3 -> 7

6
test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
View File

@ -21,6 +21,6 @@ contract A {
// EVMVersion: >=constantinople // EVMVersion: >=constantinople
// ---- // ----
// f(), 10 ether -> 3007, 3008, 3009 // f(), 10 ether -> 3007, 3008, 3009
// gas irOptimized: 257206 // gas irOptimized: 268645
// gas legacy: 422501 // gas legacy: 402016
// gas legacyOptimized: 287472 // gas legacyOptimized: 288087

6
test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
View File

@ -113,9 +113,9 @@ contract ERC20 {
// ---- // ----
// constructor() // constructor()
// ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
// gas irOptimized: 364503 // gas irOptimized: 362054
// gas legacy: 860880 // gas legacy: 852973
// gas legacyOptimized: 420959 // gas legacyOptimized: 419237
// totalSupply() -> 20 // totalSupply() -> 20
// gas irOptimized: 23415 // gas irOptimized: 23415
// gas legacy: 23653 // gas legacy: 23653

2
test/libsolidity/semanticTests/using/using_global_invisible.sol
View File

@ -40,4 +40,4 @@ contract D {
// ---- // ----
// library: "A":L // library: "A":L
// test() -> 3 // test() -> 3
// gas legacy: 130369 // gas legacy: 123521

6
test/libsolidity/semanticTests/various/erc20.sol
View File

@ -96,9 +96,9 @@ contract ERC20 {
// ---- // ----
// constructor() // constructor()
// ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
// gas irOptimized: 357114 // gas irOptimized: 357746
// gas legacy: 832643 // gas legacy: 824737
// gas legacyOptimized: 416135 // gas legacyOptimized: 414462
// totalSupply() -> 20 // totalSupply() -> 20
// gas irOptimized: 23415 // gas irOptimized: 23415
// gas legacy: 23524 // gas legacy: 23524

6
test/libsolidity/semanticTests/various/value_complex.sol
View File

@ -20,7 +20,7 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 176219 // gas irOptimized: 176003
// gas legacy: 265006 // gas legacy: 257656
// gas legacyOptimized: 182842 // gas legacyOptimized: 183070
// sendAmount(uint256): 5 -> 8 // sendAmount(uint256): 5 -> 8

6
test/libsolidity/semanticTests/various/value_insane.sol
View File

@ -19,7 +19,7 @@ contract test {
// ---- // ----
// constructor(), 20 wei -> // constructor(), 20 wei ->
// gas irOptimized: 177083 // gas irOptimized: 176867
// gas legacy: 266728 // gas legacy: 259378
// gas legacyOptimized: 184762 // gas legacyOptimized: 183682
// sendAmount(uint256): 5 -> 8 // sendAmount(uint256): 5 -> 8

6
test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
View File

@ -26,9 +26,9 @@ contract C {
// index(uint256): 10 -> true // index(uint256): 10 -> true
// index(uint256): 20 -> true // index(uint256): 20 -> true
// index(uint256): 0xFF -> true // index(uint256): 0xFF -> true
// gas irOptimized: 135578 // gas irOptimized: 135584
// gas legacy: 247324 // gas legacy: 244264
// gas legacyOptimized: 149578 // gas legacyOptimized: 152128
// accessIndex(uint256,int256): 10, 1 -> 2 // accessIndex(uint256,int256): 10, 1 -> 2
// accessIndex(uint256,int256): 10, 0 -> 1 // accessIndex(uint256,int256): 10, 0 -> 1
// accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32

28
test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
View File

@ -17,32 +17,32 @@ contract C {
// test_indices(uint256): 1 -> // test_indices(uint256): 1 ->
// test_indices(uint256): 129 -> // test_indices(uint256): 129 ->
// gas irOptimized: 3018687 // gas irOptimized: 3018687
// gas legacy: 3070431 // gas legacy: 3068883
// gas legacyOptimized: 3010325 // gas legacyOptimized: 3011615
// test_indices(uint256): 5 -> // test_indices(uint256): 5 ->
// gas irOptimized: 372543 // gas irOptimized: 372543
// gas legacy: 369211 // gas legacy: 369151
// gas legacyOptimized: 366089 // gas legacyOptimized: 366139
// test_indices(uint256): 10 -> // test_indices(uint256): 10 ->
// test_indices(uint256): 15 -> // test_indices(uint256): 15 ->
// gas irOptimized: 72860 // gas irOptimized: 72860
// test_indices(uint256): 0xFF -> // test_indices(uint256): 0xFF ->
// gas irOptimized: 3410255 // gas irOptimized: 3410255
// gas legacy: 3512637 // gas legacy: 3509577
// gas legacyOptimized: 3395047 // gas legacyOptimized: 3397597
// test_indices(uint256): 1000 -> // test_indices(uint256): 1000 ->
// gas irOptimized: 18206122 // gas irOptimized: 18206122
// gas legacy: 18611999 // gas legacy: 18599999
// gas legacyOptimized: 18166944 // gas legacyOptimized: 18176944
// test_indices(uint256): 129 -> // test_indices(uint256): 129 ->
// gas irOptimized: 2756955 // gas irOptimized: 2756955
// gas legacy: 2771961 // gas legacy: 2770413
// gas legacyOptimized: 2714999 // gas legacyOptimized: 2716289
// test_indices(uint256): 128 -> // test_indices(uint256): 128 ->
// gas irOptimized: 411903 // gas irOptimized: 411903
// gas legacy: 466504 // gas legacy: 464968
// gas legacyOptimized: 416888 // gas legacyOptimized: 418168
// test_indices(uint256): 1 -> // test_indices(uint256): 1 ->
// gas irOptimized: 368571 // gas irOptimized: 368571
// gas legacy: 363401 // gas legacy: 363389
// gas legacyOptimized: 361799 // gas legacyOptimized: 361809

24
test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
View File

@ -52,18 +52,18 @@ contract C {
// ---- // ----
// test_zeroed_indicies(uint256): 1 -> // test_zeroed_indicies(uint256): 1 ->
// test_zeroed_indicies(uint256): 5 -> // test_zeroed_indicies(uint256): 5 ->
// gas irOptimized: 131192 // gas irOptimized: 131177
// gas legacy: 132331 // gas legacy: 132301
// gas legacyOptimized: 129514 // gas legacyOptimized: 129539
// test_zeroed_indicies(uint256): 10 -> // test_zeroed_indicies(uint256): 10 ->
// gas irOptimized: 174810 // gas irOptimized: 174780
// gas legacy: 177248 // gas legacy: 177188
// gas legacyOptimized: 172062 // gas legacyOptimized: 172112
// test_zeroed_indicies(uint256): 15 -> // test_zeroed_indicies(uint256): 15 ->
// gas irOptimized: 198070 // gas irOptimized: 198025
// gas legacy: 201828 // gas legacy: 201738
// gas legacyOptimized: 194352 // gas legacyOptimized: 194427
// test_zeroed_indicies(uint256): 0xFF -> // test_zeroed_indicies(uint256): 0xFF ->
// gas irOptimized: 6098680 // gas irOptimized: 6097915
// gas legacy: 6160863 // gas legacy: 6159333
// gas legacyOptimized: 6024902 // gas legacyOptimized: 6026177