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

Merge pull request #11433 from ethereum/panic-dedup

Browse Source 
Insert a call to panic function in legacy codegen (and not inline it every single time)
This commit is contained in:
chriseth 2021-05-31 11:23:30 +02:00 committed by GitHub
commit 29a995b937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 146 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -6,6 +6,8 @@ Language Features:
Compiler Features:
* Code Generator: Insert helper functions for panic codes instead of inlining unconditionally. This can reduce costs if many panics (checks) are inserted,
but can increase costs where few panics are used.
* EVM: Set the default EVM version to "Berlin".
* SMTChecker: Function definitions can be annotated with the custom Natspec tag ``custom:smtchecker abstract-function-nondet`` to be abstracted by a nondeterministic value when called.
* Standard JSON / combined JSON: New artifact "functionDebugData" that contains bytecode offsets of entry points of functions and potentially more information in the future.

9
libsolidity/codegen/CompilerContext.cpp
View File

@ -334,14 +334,7 @@ CompilerContext& CompilerContext::appendJump(evmasm::AssemblyItem::JumpType _jum
CompilerContext& CompilerContext::appendPanic(util::PanicCode _code)
{
Whiskers templ(R"({
mstore(0, <selector>)
mstore(4, <code>)
revert(0, 0x24)
})");
templ("selector", util::selectorFromSignature("Panic(uint256)").str());
templ("code", toCompactHexWithPrefix(static_cast<unsigned>(_code)));
appendInlineAssembly(templ.render());
callYulFunction(utilFunctions().panicFunction(_code), 0, 0);
return *this;
}

10
test/cmdlineTests/function_debug_info/output
View File

@ -35,13 +35,13 @@
},
"abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr":
{
"entryPoint": 178,
"entryPoint": 164,
"parameterSlots": 2,
"returnSlots": 2
},
"abi_decode_tuple_t_uint256":
{
"entryPoint": 295,
"entryPoint": 281,
"parameterSlots": 2,
"returnSlots": 1
},
@ -49,6 +49,12 @@
{
"parameterSlots": 2,
"returnSlots": 1
},
"panic_error_0x32":
{
"entryPoint": 306,
"parameterSlots": 0,
"returnSlots": 0
}
}
}

36
test/cmdlineTests/optimizer_inliner_dynamic_reference/output
View File

@ -145,9 +145,11 @@ sub_0: assembly {
/* "optimizer_inliner_dynamic_reference/input.sol":310:365 function f() internal pure returns (uint) { return 6; } */
jump // out
tag_20:
mstore(0x00, shl(0xe0, 0x4e487b71))
mstore(0x04, 0x51)
revert(0x00, 0x24)
tag_25
tag_26
jump // in
tag_25:
jump // out
/* "#utility.yul":196:421 */
tag_22:
/* "#utility.yul":236:239 */
@ -162,7 +164,7 @@ sub_0: assembly {
gt
/* "#utility.yul":254:256 */
iszero
tag_28
tag_30
jumpi
/* "#utility.yul":312:322 */
0x4e487b71
@ -187,13 +189,37 @@ sub_0: assembly {
/* "#utility.yul":365:380 */
revert
/* "#utility.yul":254:256 */
tag_28:
tag_30:
pop
/* "#utility.yul":406:415 */
add
swap1
/* "#utility.yul":244:421 */
jump // out
/* "#utility.yul":426:553 */
tag_26:
/* "#utility.yul":487:497 */
0x4e487b71
/* "#utility.yul":482:485 */
0xe0
/* "#utility.yul":478:498 */
shl
/* "#utility.yul":475:476 */
0x00
/* "#utility.yul":468:499 */
mstore
/* "#utility.yul":518:522 */
0x51
/* "#utility.yul":515:516 */
0x04
/* "#utility.yul":508:523 */
mstore
/* "#utility.yul":542:546 */
0x24
/* "#utility.yul":539:540 */
0x00
/* "#utility.yul":532:547 */
revert
auxdata: <AUXDATA REMOVED>
}

36
test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
View File

@ -150,9 +150,11 @@ sub_0: assembly {
/* "optimizer_inliner_dynamic_reference_constructor/input.sol":304:359 function f() internal pure returns (uint) { return 6; } */
jump // out
tag_17:
mstore(0x00, shl(0xe0, 0x4e487b71))
mstore(0x04, 0x51)
revert(0x00, 0x24)
tag_21
tag_22
jump // in
tag_21:
jump // out
/* "#utility.yul":196:421 */
tag_19:
/* "#utility.yul":236:239 */
@ -167,7 +169,7 @@ sub_0: assembly {
gt
/* "#utility.yul":254:256 */
iszero
tag_24
tag_26
jumpi
/* "#utility.yul":312:322 */
0x4e487b71
@ -192,13 +194,37 @@ sub_0: assembly {
/* "#utility.yul":365:380 */
revert
/* "#utility.yul":254:256 */
tag_24:
tag_26:
pop
/* "#utility.yul":406:415 */
add
swap1
/* "#utility.yul":244:421 */
jump // out
/* "#utility.yul":426:553 */
tag_22:
/* "#utility.yul":487:497 */
0x4e487b71
/* "#utility.yul":482:485 */
0xe0
/* "#utility.yul":478:498 */
shl
/* "#utility.yul":475:476 */
0x00
/* "#utility.yul":468:499 */
mstore
/* "#utility.yul":518:522 */
0x51
/* "#utility.yul":515:516 */
0x04
/* "#utility.yul":508:523 */
mstore
/* "#utility.yul":542:546 */
0x24
/* "#utility.yul":539:540 */
0x00
/* "#utility.yul":532:547 */
revert
auxdata: <AUXDATA REMOVED>
}

2
test/cmdlineTests/standard_function_debug_info/output.json
View File

@ -1 +1 @@
{"contracts":{"a.sol":{"A":{"evm":{"bytecode":{"functionDebugData":{}},"deployedBytecode":{"functionDebugData":{"@f_19":{"entryPoint":96,"id":19,"parameterSlots":1,"returnSlots":1},"abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":247,"id":null,"parameterSlots":3,"returnSlots":1},"abi_decode_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":359,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_t_uint256":{"entryPoint":405,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":426,"id":null,"parameterSlots":2,"returnSlots":1},"abi_encode_t_uint256_to_t_uint256_fromStack":{"entryPoint":499,"id":null,"parameterSlots":2,"returnSlots":0},"abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":{"entryPoint":514,"id":null,"parameterSlots":2,"returnSlots":1},"allocate_memory":{"entryPoint":541,"id":null,"parameterSlots":1,"returnSlots":1},"allocate_unbounded":{"entryPoint":568,"id":null,"parameterSlots":0,"returnSlots":1},"array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":578,"id":null,"parameterSlots":1,"returnSlots":1},"checked_add_t_uint256":{"entryPoint":622,"id":null,"parameterSlots":2,"returnSlots":1},"cleanup_t_uint256":{"entryPoint":708,"id":null,"parameterSlots":1,"returnSlots":1},"finalize_allocation":{"entryPoint":718,"id":null,"parameterSlots":2,"returnSlots":0},"panic_error_0x11":{"entryPoint":767,"id":null,"parameterSlots":0,"returnSlots":0},"panic_error_0x41":{"entryPoint":814,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":{"entryPoint":861,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":{"entryPoint":866,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":{"entryPoint":871,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":{"entryPoint":876,"id":null,"parameterSlots":0,"returnSlots":0},"round_up_to_mul_of_32":{"entryPoint":881,"id":null,"parameterSlots":1,"returnSlots":1},"validator_revert_t_uint256":{"entryPoint":898,"id":null,"parameterSlots":1,"returnSlots":0}}}}}}},"sources":{"a.sol":{"id":0}}}
{"contracts":{"a.sol":{"A":{"evm":{"bytecode":{"functionDebugData":{}},"deployedBytecode":{"functionDebugData":{"@f_19":{"entryPoint":96,"id":19,"parameterSlots":1,"returnSlots":1},"abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":171,"id":null,"parameterSlots":3,"returnSlots":1},"abi_decode_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":283,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_t_uint256":{"entryPoint":329,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":350,"id":null,"parameterSlots":2,"returnSlots":1},"abi_encode_t_uint256_to_t_uint256_fromStack":{"entryPoint":423,"id":null,"parameterSlots":2,"returnSlots":0},"abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":{"entryPoint":438,"id":null,"parameterSlots":2,"returnSlots":1},"allocate_memory":{"entryPoint":465,"id":null,"parameterSlots":1,"returnSlots":1},"allocate_unbounded":{"entryPoint":492,"id":null,"parameterSlots":0,"returnSlots":1},"array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":502,"id":null,"parameterSlots":1,"returnSlots":1},"checked_add_t_uint256":{"entryPoint":546,"id":null,"parameterSlots":2,"returnSlots":1},"cleanup_t_uint256":{"entryPoint":632,"id":null,"parameterSlots":1,"returnSlots":1},"finalize_allocation":{"entryPoint":642,"id":null,"parameterSlots":2,"returnSlots":0},"panic_error_0x11":{"entryPoint":691,"id":null,"parameterSlots":0,"returnSlots":0},"panic_error_0x32":{"entryPoint":738,"id":null,"parameterSlots":0,"returnSlots":0},"panic_error_0x41":{"entryPoint":785,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":{"entryPoint":832,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":{"entryPoint":837,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":{"entryPoint":842,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":{"entryPoint":847,"id":null,"parameterSlots":0,"returnSlots":0},"round_up_to_mul_of_32":{"entryPoint":852,"id":null,"parameterSlots":1,"returnSlots":1},"validator_revert_t_uint256":{"entryPoint":869,"id":null,"parameterSlots":1,"returnSlots":0}}}}}}},"sources":{"a.sol":{"id":0}}}

64
test/libsolidity/SolidityExpressionCompiler.cpp
View File

@ -162,6 +162,12 @@ bytes compileFirstExpression(
context << context.functionEntryLabel(dynamic_cast<FunctionDefinition const&>(
resolveDeclaration(*sourceUnit, function, resolver)
));
context.appendMissingLowLevelFunctions();
// NOTE: We intentionally disable optimisations for utility functions to simplfy the tests
context.appendYulUtilityFunctions({});
BOOST_REQUIRE(context.appendYulUtilityFunctionsRan());
BOOST_REQUIRE(context.assemblyPtr());
LinkerObject const& object = context.assemblyPtr()->assemble();
BOOST_REQUIRE(object.immutableReferences.empty());
@ -336,7 +342,10 @@ BOOST_AUTO_TEST_CASE(arithmetic)
bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "y"}});
bytes panic =
bytes{uint8_t(Instruction::PUSH32)} +
bytes{
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::PUSH32)
} +
fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") +
bytes{
uint8_t(Instruction::PUSH1), 0x0,
@ -346,7 +355,10 @@ BOOST_AUTO_TEST_CASE(arithmetic)
uint8_t(Instruction::MSTORE),
uint8_t(Instruction::PUSH1), 0x24,
uint8_t(Instruction::PUSH1), 0x0,
uint8_t(Instruction::REVERT)
uint8_t(Instruction::REVERT),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::JUMP),
uint8_t(Instruction::JUMPDEST)
};
bytes expectation;
@ -368,22 +380,30 @@ BOOST_AUTO_TEST_CASE(arithmetic)
uint8_t(Instruction::DUP2),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::PUSH1), 0x48,
uint8_t(Instruction::JUMPI)
} + panic + bytes{
uint8_t(Instruction::PUSH1), 0x20,
uint8_t(Instruction::JUMPI),
uint8_t(Instruction::PUSH1), 0x1f,
uint8_t(Instruction::PUSH1), 0x36,
uint8_t(Instruction::JUMP),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::MOD),
uint8_t(Instruction::DUP2),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::PUSH1), 0x7e,
uint8_t(Instruction::JUMPI)
} + panic + bytes{
uint8_t(Instruction::PUSH1), 0x2e,
uint8_t(Instruction::JUMPI),
uint8_t(Instruction::PUSH1), 0x2d,
uint8_t(Instruction::PUSH1), 0x36,
uint8_t(Instruction::JUMP),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::DIV),
uint8_t(Instruction::PUSH1), 0x1,
uint8_t(Instruction::MUL)
};
uint8_t(Instruction::MUL),
uint8_t(Instruction::PUSH1), 0x67,
uint8_t(Instruction::JUMP)
} + panic;
else
expectation = bytes{
uint8_t(Instruction::PUSH1), 0x1,
@ -403,21 +423,29 @@ BOOST_AUTO_TEST_CASE(arithmetic)
uint8_t(Instruction::DUP2),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::PUSH1), 0x4a,
uint8_t(Instruction::JUMPI)
} + panic + bytes{
uint8_t(Instruction::PUSH1), 0x22,
uint8_t(Instruction::JUMPI),
uint8_t(Instruction::PUSH1), 0x21,
uint8_t(Instruction::PUSH1), 0x36,
uint8_t(Instruction::JUMP),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::MOD),
uint8_t(Instruction::DUP2),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::ISZERO),
uint8_t(Instruction::PUSH1), 0x80,
uint8_t(Instruction::JUMPI)
} + panic + bytes{
uint8_t(Instruction::PUSH1), 0x30,
uint8_t(Instruction::JUMPI),
uint8_t(Instruction::PUSH1), 0x2f,
uint8_t(Instruction::PUSH1), 0x36,
uint8_t(Instruction::JUMP),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::JUMPDEST),
uint8_t(Instruction::DIV),
uint8_t(Instruction::MUL)
};
uint8_t(Instruction::MUL),
uint8_t(Instruction::PUSH1), 0x67,
uint8_t(Instruction::JUMP)
} + panic;
BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
}

6
test/libsolidity/gasTests/dispatch_large.sol
View File

@ -24,9 +24,9 @@ contract Large {
}
// ----
// creation:
// codeDepositCost: 904400
// executionCost: 942
// totalCost: 905342
// codeDepositCost: 640200
// executionCost: 676
// totalCost: 640876
// external:
// a(): 2475
// b(uint256): infinite

6
test/libsolidity/gasTests/dispatch_large_optimised.sol
View File

@ -27,9 +27,9 @@ contract Large {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 256400
// executionCost: 300
// totalCost: 256700
// codeDepositCost: 232800
// executionCost: 275
// totalCost: 233075
// external:
// a(): 2283
// b(uint256): 4937

6
test/libsolidity/gasTests/dispatch_medium.sol
View File

@ -11,9 +11,9 @@ contract Medium {
}
// ----
// creation:
// codeDepositCost: 351400
// executionCost: 386
// totalCost: 351786
// codeDepositCost: 269600
// executionCost: 312
// totalCost: 269912
// external:
// a(): 2452
// b(uint256): infinite

6
test/libsolidity/gasTests/dispatch_medium_optimised.sol
View File

@ -14,9 +14,9 @@ contract Medium {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 146800
// executionCost: 190
// totalCost: 146990
// codeDepositCost: 131600
// executionCost: 177
// totalCost: 131777
// external:
// a(): 2283
// b(uint256): 4695

6
test/libsolidity/gasTests/dispatch_small.sol
View File

@ -6,9 +6,9 @@ contract Small {
}
// ----
// creation:
// codeDepositCost: 114600
// executionCost: 159
// totalCost: 114759
// codeDepositCost: 108800
// executionCost: 153
// totalCost: 108953
// external:
// fallback: 129
// a(): 2407

4
test/libsolidity/gasTests/dispatch_small_optimised.sol
View File

@ -9,9 +9,9 @@ contract Small {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 62000
// codeDepositCost: 60800
// executionCost: 111
// totalCost: 62111
// totalCost: 60911
// external:
// fallback: 118
// a(): 2261

2
test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
View File

@ -22,5 +22,5 @@ contract B {
// ----
// f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
// gas irOptimized: 133483
// gas legacy: 263810
// gas legacy: 235167
// gas legacyOptimized: 133299

4
test/libsolidity/semanticTests/array/function_array_cross_calls.sol
View File

@ -46,5 +46,5 @@ contract C {
// ----
// test() -> 5, 6, 7
// gas irOptimized: 337455
// gas legacy: 499937
// gas legacyOptimized: 300513
// gas legacy: 463662
// gas legacyOptimized: 296513

4
test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
View File

@ -27,5 +27,5 @@ contract Creator {
// ----
// f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
// gas irOptimized: 486618
// gas legacy: 590826
// gas legacyOptimized: 448624
// gas legacy: 592626
// gas legacyOptimized: 450224

4
test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
View File

@ -27,5 +27,5 @@ contract Creator {
// ----
// f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
// gas irOptimized: 336157
// gas legacy: 427373
// gas legacyOptimized: 296781
// gas legacy: 429173
// gas legacyOptimized: 298384

4
test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
View File

@ -19,8 +19,8 @@ contract C {
// test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
// test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
// gas irOptimized: 151436
// gas legacy: 131815
// gas legacyOptimized: 112039
// gas legacy: 131830
// gas legacyOptimized: 112054
// test_boundary_check(uint256,uint256): 256, 255 -> 0
// gas irOptimized: 153717
// gas legacy: 134149