cerc-io/solidity
11
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 branch 'develop' of github.com:tfire/solidity into fix/remove-namespace-ast-annotations

Browse Source
This commit is contained in:
Tyler
2022-03-10 17:39:29 -05:00
parent 1653b6c5b7 4263b893a3
commit 1c58b91075
190 changed files with 1684 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/cmdlineTests/constant_optimizer_yul/output
-1
View File
@@ -27,7 +27,6 @@ object "C_12" {
code {
{
/// @src 0:61:418 "contract C {..."
mstore(64, memoryguard(0x80))
if callvalue() { revert(0, 0) }
/// @src 0:279:410 "assembly {..."
sstore(0, 0x1000000000000000000000000000000000000000000000)
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+5 -7
View File
@@ -201,16 +201,14 @@ object "C_6" {
code {
{
/// @src 0:60:101 "contract C {..."
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+5 -7
View File
@@ -200,16 +200,14 @@ object "C_6" {
code {
{
/// @src 0:60:101
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+5 -7
View File
@@ -189,16 +189,14 @@ object "C_6" {
object "C_6_deployed" {
code {
{
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
-2
View File
@@ -95,7 +95,6 @@ object "C_2" {
code {
{
/// @src 0:265:278 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
@@ -559,7 +558,6 @@ object "D_27" {
code {
{
/// @src 0:265:278 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
-2
View File
@@ -24,7 +24,6 @@ object "C_7" {
code {
{
/// @src 0:82:117 "contract C {..."
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
@@ -58,7 +57,6 @@ object "D_10" {
code {
{
/// @src 0:118:137 "contract D is C {..."
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
test/cmdlineTests/ir_compiler_subobjects/output
-2
View File
@@ -24,7 +24,6 @@ object "C_3" {
code {
{
/// @src 0:82:95 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
@@ -110,7 +109,6 @@ object "D_16" {
code {
{
/// @src 0:82:95 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+5 -11
View File
@@ -11,11 +11,7 @@ object "D_12" {
code {
{
/// @src 0:82:175 "contract D {..."
mstore(64, 128)
if callvalue() { revert(0, 0) }
/// @src 0:115:139 "assembly { mstore(0,0) }"
mstore(0, 0)
/// @src 0:82:175 "contract D {..."
let _1 := datasize("D_12_deployed")
codecopy(128, dataoffset("D_12_deployed"), _1)
return(128, _1)
@@ -26,16 +22,14 @@ object "D_12" {
code {
{
/// @src 0:82:175 "contract D {..."
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
-3
View File
@@ -24,7 +24,6 @@ object "D_8" {
code {
{
/// @src 0:82:166 "contract D {..."
mstore(64, 128)
if iszero(lt(calldatasize(), 4))
{
let _1 := 0
@@ -32,8 +31,6 @@ object "D_8" {
{
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
/// @src 0:134:158 "assembly { mstore(0,0) }"
mstore(/** @src 0:82:166 "contract D {..." */ _1, _1)
return(128, _1)
}
}
test/cmdlineTests/keccak_optimization_deploy_code/output
-3
View File
@@ -11,7 +11,6 @@ object "C_12" {
code {
{
/// @src 0:62:463 "contract C {..."
mstore(64, 128)
if callvalue() { revert(0, 0) }
/// @src 0:103:275 "assembly {..."
mstore(0, 100)
@@ -27,10 +26,8 @@ object "C_12" {
code {
{
/// @src 0:62:463 "contract C {..."
mstore(64, 128)
if callvalue() { revert(0, 0) }
/// @src 0:317:454 "assembly {..."
mstore(0, 100)
sstore(0, 17385872270140913825666367956517731270094621555228275961425792378517567244498)
/// @src 0:62:463 "contract C {..."
stop()
test/cmdlineTests/keccak_optimization_low_runs/output
-1
View File
@@ -24,7 +24,6 @@ object "C_7" {
code {
{
/// @src 0:62:285 "contract C {..."
mstore(64, 128)
if callvalue() { revert(0, 0) }
/// @src 0:109:277 "assembly {..."
mstore(0, 100)
test/cmdlineTests/optimizer_user_yul/output
+2 -3
View File
@@ -58,10 +58,9 @@ tag_6:
/* "optimizer_user_yul/input.sol":384:392 sload(5) */
dup1
/* "optimizer_user_yul/input.sol":376:509 for { } sload(5) { } {... */
tag_8
iszero
tag_6
jumpi
jump(tag_6)
tag_8:
/* "optimizer_user_yul/input.sol":380:383 { } */
pop
/* "optimizer_user_yul/input.sol":340:513 {... */
test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+3 -24
View File
@@ -1,8 +1,5 @@
{"contracts":{"C":{"C":{"evm":{"assembly":" /* \"C\":79:428 contract C... */
0xa0
dup1
0x40
mstore
jumpi(tag_6, callvalue)
0x1f
bytecodeSize
@@ -438,9 +435,6 @@ sub_0: assembly {
}
"}}},"D":{"D":{"evm":{"assembly":" /* \"D\":91:166 contract D is C(3)... */
0xa0
dup1
0x40
mstore
jumpi(tag_6, callvalue)
0x1f
bytecodeSize
@@ -514,13 +508,8 @@ tag_4:
tag_1:
/* \"C\":147:149 42 */
mstore(0x80, 0x2a)
/* \"D\":107:108 3 */
0x03
/* \"C\":203:219 stateVar = _init */
0x00
/* \"D\":91:166 contract D is C(3)... */
sstore
sub(shl(0xff, 0x01), 0x04)
/* \"D\":91:166 contract D is C(3)... */
dup2
sgt
0x01
@@ -531,9 +520,7 @@ tag_1:
0x03
/* \"D\":91:166 contract D is C(3)... */
add
/* \"C\":203:219 stateVar = _init */
0x00
/* \"D\":91:166 contract D is C(3)... */
sstore
/* \"D\":113:164 constructor(int _init2)... */
jump\t// out
@@ -541,17 +528,9 @@ tag_1:
tag_9:
pop
pop
shl(0xe0, 0x4e487b71)
/* \"C\":203:219 stateVar = _init */
0x00
/* \"D\":91:166 contract D is C(3)... */
mstore
mstore(0x00, shl(0xe0, 0x4e487b71))
mstore(0x04, 0x11)
0x24
/* \"C\":203:219 stateVar = _init */
0x00
/* \"D\":91:166 contract D is C(3)... */
revert
revert(0x00, 0x24)
stop
sub_0: assembly {
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+5 -7
View File
@@ -206,16 +206,14 @@ object \"C_6\" {
code {
{
/// @src 0:60:101 \"contract C {...\"
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+5 -7
View File
@@ -205,16 +205,14 @@ object \"C_6\" {
code {
{
/// @src 0:60:101
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+5 -7
View File
@@ -194,16 +194,14 @@ object \"C_6\" {
object \"C_6_deployed\" {
code {
{
let _1 := memoryguard(0x80)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
let _2 := 0
if eq(0x26121ff0, shr(224, calldataload(_2)))
let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_1)))
{
if callvalue() { revert(_2, _2) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
return(_1, _2)
if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
return(memoryguard(0x80), _1)
}
}
revert(0, 0)
test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+3 -7
View File
@@ -622,7 +622,6 @@ object \"C_54\" {
{
/// @src 0:79:435 \"contract C...\"
let _1 := memoryguard(0xa0)
mstore(64, _1)
if callvalue() { revert(0, 0) }
let programSize := datasize(\"C_54\")
let argSize := sub(codesize(), programSize)
@@ -1469,7 +1468,6 @@ object \"D_72\" {
{
/// @src 1:91:166 \"contract D is C(3)...\"
let _1 := memoryguard(0xa0)
mstore(64, _1)
if callvalue() { revert(0, 0) }
let programSize := datasize(\"D_72\")
let argSize := sub(codesize(), programSize)
@@ -1500,15 +1498,13 @@ object \"D_72\" {
/// @src 0:154:156 \"42\"
mstore(128, 0x2a)
/// @src 1:91:166 \"contract D is C(3)...\"
sstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:107:108 \"3\" */ 0x03)
/// @src 1:91:166 \"contract D is C(3)...\"
if and(1, sgt(var_init2, sub(shl(255, 1), 4)))
{
mstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:91:166 \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x11)
revert(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @src 1:91:166 \"contract D is C(3)...\" */ 0x24)
revert(0, 0x24)
}
sstore(/** @src 0:210:226 \"stateVar = _init\" */ 0x00, /** @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)...\" */ var_init2))
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)...\" */ var_init2))
}
}
/// @use-src 0:\"C\", 1:\"D\"
test/cmdlineTests/viair_subobject_optimization/output
-11
View File
@@ -3,9 +3,6 @@
EVM assembly:
/* "viair_subobject_optimization/input.sol":61:668 contract C {... */
0x80
dup1
0x40
mstore
jumpi(tag_6, callvalue)
0x1f
bytecodeSize
@@ -86,7 +83,6 @@ stop
sub_0: assembly {
/* "viair_subobject_optimization/input.sol":61:668 contract C {... */
mstore(0x40, 0x80)
0x00
dup1
revert
@@ -120,9 +116,6 @@ stop
sub_0: assembly {
/* "viair_subobject_optimization/input.sol":669:772 contract D {... */
0x80
dup1
0x40
mstore
jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
tag_3:
pop
@@ -283,9 +276,6 @@ sub_0: assembly {
sub_0: assembly {
/* "viair_subobject_optimization/input.sol":61:668 contract C {... */
0x80
dup1
0x40
mstore
jumpi(tag_6, callvalue)
0x1f
bytecodeSize
@@ -366,7 +356,6 @@ sub_0: assembly {
sub_0: assembly {
/* "viair_subobject_optimization/input.sol":61:668 contract C {... */
mstore(0x40, 0x80)
0x00
dup1
revert
test/cmdlineTests/viair_subobjects/output
-2
View File
@@ -30,7 +30,6 @@ object "C_3" {
code {
{
/// @src 0:82:95 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
@@ -122,7 +121,6 @@ object "D_16" {
code {
{
/// @src 0:82:95 "contract C {}"
mstore(64, memoryguard(0x80))
revert(0, 0)
}
}
test/externalTests.sh
-1
View File
@@ -39,7 +39,6 @@ printTask "Running external tests..."
"{$REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
"{$REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
"{$REPO_ROOT}/test/externalTests/gnosis-v2.sh" "$@"
"{$REPO_ROOT}/test/externalTests/colony.sh" "$@"
"{$REPO_ROOT}/test/externalTests/ens.sh" "$@"
"{$REPO_ROOT}/test/externalTests/trident.sh" "$@"
test/externalTests/common.sh
+23 -1
View File
@@ -233,7 +233,6 @@ function force_truffle_compiler_settings
function name_hardhat_default_export
{
local config_file="$1"
local config_var_name="$2"
local import="import {HardhatUserConfig} from 'hardhat/types';"
local config="const config: HardhatUserConfig = {"
@@ -241,6 +240,29 @@ function name_hardhat_default_export
echo "export default config;" >> "$config_file"
}
function force_hardhat_timeout
{
local config_file="$1"
local config_var_name="$2"
local new_timeout="$3"
printLog "Configuring Hardhat..."
echo "-------------------------------------"
echo "Timeout: ${new_timeout}"
echo "-------------------------------------"
if [[ $config_file == *\.js ]]; then
[[ $config_var_name == "" ]] || assertFail
echo "module.exports.mocha = module.exports.mocha || {timeout: ${new_timeout}}"
echo "module.exports.mocha.timeout = ${new_timeout}"
else
[[ $config_file == *\.ts ]] || assertFail
[[ $config_var_name != "" ]] || assertFail
echo "${config_var_name}.mocha = ${config_var_name}.mocha ?? {timeout: ${new_timeout}};"
echo "${config_var_name}.mocha!.timeout = ${new_timeout}"
fi >> "$config_file"
}
function force_hardhat_compiler_binary
{
local config_file="$1"
test/externalTests/euler.sh
+2
View File
@@ -63,6 +63,8 @@ function euler_test
force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
force_hardhat_unlimited_contract_size "$config_file"
# Workaround for the timeout that's too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765)
force_hardhat_timeout "$config_file" "" 100000
npm install
replace_version_pragmas
test/externalTests/gnosis-v2.sh
-81
View File
@@ -1,81 +0,0 @@
#!/usr/bin/env bash
# ------------------------------------------------------------------------------
# This file is part of solidity.
#
# solidity is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# solidity is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with solidity. If not, see <http://www.gnu.org/licenses/>
#
# (c) 2020 solidity contributors.
#------------------------------------------------------------------------------
set -e
source scripts/common.sh
source test/externalTests/common.sh
REPO_ROOT=$(realpath "$(dirname "$0")/../..")
verify_input "$@"
BINARY_TYPE="$1"
BINARY_PATH="$2"
SELECTED_PRESETS="$3"
function compile_fn { npx truffle compile; }
function test_fn { npm test; }
function gnosis_safe_test
{
local repo="https://github.com/solidity-external-tests/safe-contracts.git"
local ref_type=branch
local ref="v2_080"
local config_file="truffle-config.js"
local compile_only_presets=(
legacy-no-optimize # Compiles but migrations run out of gas: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
)
local settings_presets=(
"${compile_only_presets[@]}"
#ir-no-optimize # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
#ir-optimize-evm-only # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
ir-optimize-evm+yul
legacy-optimize-evm-only
legacy-optimize-evm+yul
)
[[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
print_presets_or_exit "$SELECTED_PRESETS"
setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
download_project "$repo" "$ref_type" "$ref" "$DIR"
[[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
neutralize_package_lock
neutralize_package_json_hooks
force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
npm install --package-lock
npm install eth-gas-reporter
replace_version_pragmas
[[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
for preset in $SELECTED_PRESETS; do
truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
store_benchmark_report truffle gnosis2 "$repo" "$preset"
done
}
external_test Gnosis-Safe-V2 gnosis_safe_test
test/externalTests/gnosis.sh
+24 -14
View File
@@ -31,24 +31,26 @@ BINARY_TYPE="$1"
BINARY_PATH="$2"
SELECTED_PRESETS="$3"
function compile_fn { npx truffle compile; }
function compile_fn { npm run build; }
function test_fn { npm test; }
function gnosis_safe_test
{
local repo="https://github.com/solidity-external-tests/safe-contracts.git"
local repo="https://github.com/gnosis/safe-contracts.git"
local ref_type=branch
local ref="development_080"
local config_file="truffle-config.js"
local ref=main
local config_file="hardhat.config.ts"
local config_var=userConfig
local compile_only_presets=()
local compile_only_presets=(
ir-optimize-evm+yul # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
)
local settings_presets=(
"${compile_only_presets[@]}"
#ir-no-optimize # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
#ir-optimize-evm-only # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
ir-optimize-evm+yul
#legacy-no-optimize # Compilation fails with "Stack too deep" error
#legacy-optimize-evm-only # Compilation fails with "Stack too deep" error
legacy-no-optimize
legacy-optimize-evm-only
legacy-optimize-evm+yul
)
@@ -59,20 +61,28 @@ function gnosis_safe_test
download_project "$repo" "$ref_type" "$ref" "$DIR"
[[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
# NOTE: The patterns below intentionally have hard-coded versions.
# When the upstream updates them, there's a chance we can just remove the regex.
sed -i 's|"@gnosis\.pm/mock-contract": "\^4\.0\.0"|"@gnosis.pm/mock-contract": "github:solidity-external-tests/mock-contract#master_080"|g' package.json
sed -i 's|"@openzeppelin/contracts": "\^3\.4\.0"|"@openzeppelin/contracts": "^4.0.0"|g' package.json
# Disable two tests failing due to Hardhat's heuristics not yet updated to handle solc 0.8.10.
# TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051).
sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
neutralize_package_lock
neutralize_package_json_hooks
force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
npm install --package-lock
npm install eth-gas-reporter
force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
npm install
npm install hardhat-gas-reporter
replace_version_pragmas
[[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
for preset in $SELECTED_PRESETS; do
truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
store_benchmark_report truffle gnosis "$repo" "$preset"
hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
store_benchmark_report hardhat gnosis "$repo" "$preset"
done
}
test/formal/redundant_store_unrelated.py
+63
View File
@@ -0,0 +1,63 @@
import sys
from z3 import Solver, Int, unsat
"""
Tests that the conditions inside RedundantStoreEliminator::knownUnrelated
only return "unrelated" incorrectly if one of the operation reverts
due to large memory access.
"""
n_bits = 256
solver = Solver()
solver.set("timeout", 60000)
def restrict(x):
solver.add(x >= 0)
solver.add(x < 2**n_bits)
def restrictedInt(x):
var = Int(x)
restrict(var)
return var
start1 = restrictedInt('start1')
length1 = restrictedInt('length1')
start2 = restrictedInt('start2')
length2 = restrictedInt('length2')
k = Int('k')
diff = Int('diff')
solver.add(diff == start2 - start1 + k * 2**n_bits)
restrict(diff)
# diff is the result of sub(start2, start1) in EVM
# These are the conditions in the code.
solver.add(diff >= length1)
solver.add(diff <= 2**(n_bits-1))
# We check that the two conditions are conflicting:
# - overlap
# - start1 is small
# Overlap:
# x is a potential point where the memory operations
# overlap.
# Note that we do not use wrapping arithmetic
# here, because it is not done in the EVM either.
# For example calldatacopy(2**256 - 2, 0, 10)
# (copy 10 bytes from calldata position zero to memory
# position 2**256 - 2) would not write to memory position
# zero either.
x = Int('x')
solver.add(start1 <= x)
solver.add(x < start1 + length1)
solver.add(start2 <= x)
solver.add(x < start2 + length2)
# start1 is "small":
solver.add(start1 < 2**(n_bits-1))
if solver.check() != unsat:
print("Expected unsat but got something else")
sys.exit(1)
test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+2 -2
View File
@@ -25,5 +25,5 @@ contract C {
// ----
// f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
// gas irOptimized: 203312
// gas legacy: 206084
// gas legacyOptimized: 203068
// gas legacy: 206075
// gas legacyOptimized: 203059
test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+4 -4
View File
@@ -61,9 +61,9 @@ contract C {
// ----
// test_bytes() ->
// gas irOptimized: 371919
// gas legacy: 418955
// gas legacyOptimized: 326783
// gas legacy: 416585
// gas legacyOptimized: 322043
// test_uint256() ->
// gas irOptimized: 523001
// gas legacy: 586784
// gas legacyOptimized: 451529
// gas legacy: 583100
// gas legacyOptimized: 444161
test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+4 -4
View File
@@ -62,9 +62,9 @@ contract C {
// ----
// test_bytes() ->
// gas irOptimized: 371919
// gas legacy: 418955
// gas legacyOptimized: 326783
// gas legacy: 416585
// gas legacyOptimized: 322043
// test_uint256() ->
// gas irOptimized: 523001
// gas legacy: 586784
// gas legacyOptimized: 451529
// gas legacy: 583100
// gas legacyOptimized: 444161
test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+2 -2
View File
@@ -22,5 +22,5 @@ contract C {
// f(uint256[][1]): 32, 32, 1, 42 -> true
// f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
// gas irOptimized: 171842
// gas legacy: 141644
// gas legacyOptimized: 121532
// gas legacy: 140672
// gas legacyOptimized: 119588
test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+2 -2
View File
@@ -12,5 +12,5 @@ contract C {
// ----
// f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
// gas irOptimized: 135918
// gas legacy: 137190
// gas legacyOptimized: 136082
// gas legacy: 137181
// gas legacyOptimized: 136073
test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+1 -1
View File
@@ -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: 189871
// gas irOptimized: 189817
// gas legacy: 211149
// gas legacyOptimized: 206054
// data(uint256,uint256): 0x02, 0x02 -> 0x09
test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+2 -2
View File
@@ -48,8 +48,8 @@ contract c {
// storageEmpty -> 0
// test_long() -> 67
// gas irOptimized: 89148
// gas legacy: 103590
// gas legacyOptimized: 101044
// gas legacy: 103039
// gas legacyOptimized: 100493
// storageEmpty -> 0
// test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
// gas legacy: 61930
test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+3 -3
View File
@@ -19,6 +19,6 @@ contract c {
// compileViaYul: also
// ----
// test() -> 0
// gas irOptimized: 158143
// gas legacy: 189715
// gas legacyOptimized: 184472
// gas irOptimized: 157951
// gas legacy: 188576
// gas legacyOptimized: 183333
test/libsolidity/semanticTests/array/bytes_length_member.sol
+2 -2
View File
@@ -16,6 +16,6 @@ contract c {
// getLength() -> 0
// set(): 1, 2 -> true
// gas irOptimized: 110439
// gas legacy: 110726
// gas legacyOptimized: 110567
// gas legacy: 110723
// gas legacyOptimized: 110564
// getLength() -> 68
test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+1 -1
View File
@@ -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: 650647
// gas irOptimized: 650608
// gas legacy: 694515
// gas legacyOptimized: 694013
// retrieve() -> 9, 28, 9, 28, 4, 3, 32
test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+3 -3
View File
@@ -21,6 +21,6 @@ contract c {
// compileViaYul: also
// ----
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
// gas irOptimized: 212571
// gas legacy: 221883
// gas legacyOptimized: 220734
// gas irOptimized: 212568
// gas legacy: 221856
// gas legacyOptimized: 220680
test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+5 -5
View File
@@ -37,12 +37,12 @@ contract c {
// compileViaYul: also
// ----
// test() -> 0x02000202
// gas irOptimized: 4652058
// gas legacy: 4578341
// gas legacyOptimized: 4548354
// gas irOptimized: 4652050
// gas legacy: 4578320
// gas legacyOptimized: 4548312
// storageEmpty -> 1
// clear() -> 0, 0
// gas irOptimized: 4483175
// gas legacy: 4410769
// gas legacyOptimized: 4382531
// gas legacy: 4410748
// gas legacyOptimized: 4382489
// storageEmpty -> 1
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+1 -1
View File
@@ -17,7 +17,7 @@ contract c {
// ----
// setData1(uint256,uint256,uint256): 10, 5, 4 ->
// copyStorageStorage() ->
// gas irOptimized: 111406
// gas irOptimized: 111397
// gas legacy: 109278
// gas legacyOptimized: 109268
// getData2(uint256): 5 -> 10, 4
test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+1 -1
View File
@@ -19,7 +19,7 @@ contract c {
// compileViaYul: also
// ----
// test() -> 4, 5
// gas irOptimized: 238826
// gas irOptimized: 238799
// gas legacy: 238736
// gas legacyOptimized: 237159
// storageEmpty -> 1
test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+2 -2
View File
@@ -21,5 +21,5 @@ contract c {
// ----
// test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
// gas irOptimized: 129167
// gas legacy: 186406
// gas legacyOptimized: 166126
// gas legacy: 186184
// gas legacyOptimized: 165682
test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+2 -2
View File
@@ -23,5 +23,5 @@ contract c {
// ----
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
// gas irOptimized: 294772
// gas legacy: 303653
// gas legacyOptimized: 301999
// gas legacy: 303626
// gas legacyOptimized: 301945
test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+2 -2
View File
@@ -23,5 +23,5 @@ contract c {
// ----
// test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
// gas irOptimized: 273963
// gas legacy: 276381
// gas legacyOptimized: 275453
// gas legacy: 276360
// gas legacyOptimized: 275411
test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+2 -2
View File
@@ -48,6 +48,6 @@ contract C {
// ----
// copyExternalStorageArrayOfFunctionType() -> true
// gas irOptimized: 104669
// gas legacy: 108725
// gas legacyOptimized: 102441
// gas legacy: 108722
// gas legacyOptimized: 102438
// copyInternalArrayOfFunctionType() -> true
test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+2 -2
View File
@@ -51,7 +51,7 @@ contract C {
// ----
// copyExternalStorageArraysOfFunctionType() -> true
// gas irOptimized: 104342
// gas legacy: 108462
// gas legacyOptimized: 102174
// gas legacy: 108459
// gas legacyOptimized: 102171
// copyInternalArrayOfFunctionType() -> true
// gas legacy: 104178
test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+1 -1
View File
@@ -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: 121048
// gas irOptimized: 121021
test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+4 -4
View File
@@ -8,12 +8,12 @@ contract c {
// ----
// set(uint256): 1, 2 -> true
// gas irOptimized: 110604
// gas legacy: 111091
// gas legacyOptimized: 110736
// gas legacy: 111088
// gas legacyOptimized: 110733
// set(uint256): 2, 2, 3, 4, 5 -> true
// gas irOptimized: 177564
// gas legacy: 178021
// gas legacyOptimized: 177666
// gas legacy: 178018
// gas legacyOptimized: 177663
// storageEmpty -> 0
// copy(uint256,uint256): 1, 2 -> true
// storageEmpty -> 0
test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+10 -10
View File
@@ -20,24 +20,24 @@ contract c {
// f(uint256): 0 -> 0x20, 0x00
// f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
// gas irOptimized: 121741
// gas legacy: 124364
// gas legacyOptimized: 119898
// gas legacy: 123884
// gas legacyOptimized: 119139
// f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
// gas irOptimized: 130733
// gas legacy: 135431
// gas legacyOptimized: 130829
// gas legacy: 134936
// gas legacyOptimized: 130046
// f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
// gas irOptimized: 137732
// gas legacy: 142238
// gas legacyOptimized: 137518
// gas legacy: 141728
// gas legacyOptimized: 136711
// f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
// gas irOptimized: 152352
// gas legacy: 160728
// gas legacyOptimized: 152168
// gas legacy: 159768
// gas legacyOptimized: 150641
// f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
// gas legacy: 59345
// gas legacyOptimized: 57279
// f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
// gas irOptimized: 406089
// gas legacy: 423017
// gas legacyOptimized: 406021
// gas legacy: 421067
// gas legacyOptimized: 402910
test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+4 -4
View File
@@ -38,11 +38,11 @@ contract C {
// ----
// f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
// gas irOptimized: 179899
// gas legacy: 180694
// gas legacyOptimized: 180088
// gas legacy: 180676
// gas legacyOptimized: 180070
// g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
// gas irOptimized: 107274
// gas legacy: 107895
// gas legacyOptimized: 107254
// gas legacy: 107877
// gas legacyOptimized: 107236
// h() -> 0x40, 0x60, 0x00, 0x00
// storageEmpty -> 1
test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+3 -3
View File
@@ -48,6 +48,6 @@ contract C {
// compileViaYul: also
// ----
// f() -> 0xff
// gas irOptimized: 121145
// gas legacy: 128035
// gas legacyOptimized: 123476
// gas irOptimized: 121125
// gas legacy: 128005
// gas legacyOptimized: 123446
test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+1 -1
View File
@@ -18,6 +18,6 @@ contract C {
// compileViaYul: also
// ----
// test() -> 7
// gas irOptimized: 124041
// gas irOptimized: 124037
// gas legacy: 205196
// gas legacyOptimized: 204987
test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+2 -2
View File
@@ -10,8 +10,8 @@ contract c {
// ----
// set(): 1, 2, 3, 4, 5 -> true
// gas irOptimized: 177390
// gas legacy: 177656
// gas legacyOptimized: 177496
// gas legacy: 177653
// gas legacyOptimized: 177493
// storageEmpty -> 0
// reset() -> true
// storageEmpty -> 1
test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+2 -2
View File
@@ -22,8 +22,8 @@ contract sender {
// ----
// (): 7 ->
// gas irOptimized: 110954
// gas legacy: 111082
// gas legacyOptimized: 111027
// gas legacy: 111073
// gas legacyOptimized: 111018
// val() -> 0
// forward(bool): true -> true
// val() -> 0x80
test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+2 -2
View File
@@ -21,5 +21,5 @@ contract C {
// ----
// f() -> 3
// gas irOptimized: 129916
// gas legacy: 130307
// gas legacyOptimized: 129363
// gas legacy: 130181
// gas legacyOptimized: 129198
test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+2 -2
View File
@@ -20,5 +20,5 @@ contract C {
// ----
// f() -> 1, 2, 3, 4, 5, 6, 7
// gas irOptimized: 207785
// gas legacy: 212325
// gas legacyOptimized: 211486
// gas legacy: 212313
// gas legacyOptimized: 211462
test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+2 -2
View File
@@ -14,5 +14,5 @@ contract C {
// ----
// f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
// gas irOptimized: 202840
// gas legacy: 204459
// gas legacyOptimized: 203437
// gas legacy: 204441
// gas legacyOptimized: 203419
test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+2 -2
View File
@@ -21,5 +21,5 @@ contract C {
// ----
// f() -> 1, 2, 3, 4, 5, 6, 7
// gas irOptimized: 207785
// gas legacy: 212330
// gas legacyOptimized: 211491
// gas legacy: 212318
// gas legacyOptimized: 211467
test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+2 -2
View File
@@ -16,5 +16,5 @@ contract C {
// ----
// f() -> 2, 3, 4
// gas irOptimized: 114120
// gas legacy: 126449
// gas legacyOptimized: 120902
// gas legacy: 126350
// gas legacyOptimized: 120704
test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+2 -2
View File
@@ -19,5 +19,5 @@ contract c {
// ----
// test1() -> true
// gas irOptimized: 225894
// gas legacy: 255577
// gas legacyOptimized: 248611
// gas legacy: 254650
// gas legacyOptimized: 247384
test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+1 -1
View File
@@ -16,4 +16,4 @@ contract C {
// compileViaYul: also
// ----
// f() -> 0, 0, 0
// gas irOptimized: 91098
// gas irOptimized: 90992
test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+2 -2
View File
@@ -17,8 +17,8 @@ contract c {
// storageEmpty -> 1
// fill() ->
// gas irOptimized: 519886
// gas legacy: 521773
// gas legacyOptimized: 517048
// gas legacy: 521710
// gas legacyOptimized: 516922
// storageEmpty -> 0
// halfClear() ->
// storageEmpty -> 0
test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+2 -2
View File
@@ -14,8 +14,8 @@ contract c {
// storageEmpty -> 1
// fill() ->
// gas irOptimized: 465544
// gas legacy: 471460
// gas legacyOptimized: 467520
// gas legacy: 471400
// gas legacyOptimized: 467400
// storageEmpty -> 0
// clear() ->
// storageEmpty -> 1
test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+3 -3
View File
@@ -21,6 +21,6 @@ contract B {
// compileViaYul: also
// ----
// f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
// gas irOptimized: 130152
// gas legacy: 234943
// gas legacyOptimized: 132863
// gas irOptimized: 129910
// gas legacy: 234719
// gas legacyOptimized: 132639
test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+1 -1
View File
@@ -11,7 +11,7 @@ contract Creator {
// compileViaYul: also
// ----
// constructor(): 1, 2, 3, 4 ->
// gas irOptimized: 129908
// gas irOptimized: 128995
// gas legacy: 176789
// gas legacyOptimized: 129585
// r() -> 4
test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+3 -3
View File
@@ -45,6 +45,6 @@ contract C {
// compileViaYul: also
// ----
// test() -> 5, 6, 7
// gas irOptimized: 298983
// gas legacy: 452172
// gas legacyOptimized: 285017
// gas irOptimized: 298735
// gas legacy: 452136
// gas legacyOptimized: 284945
test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+3 -3
View File
@@ -25,7 +25,7 @@ contract c {
// compileViaYul: also
// ----
// test() -> 1, 2, 3
// gas irOptimized: 2271482
// gas legacy: 2273722
// gas legacyOptimized: 2262396
// gas irOptimized: 2271050
// gas legacy: 2273434
// gas legacyOptimized: 2261820
// storageEmpty -> 1
test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+2 -2
View File
@@ -21,6 +21,6 @@ contract c {
// ----
// test() -> 38, 28, 18
// gas irOptimized: 188649
// gas legacy: 189780
// gas legacyOptimized: 178870
// gas legacy: 189492
// gas legacyOptimized: 178294
// storageEmpty -> 1
test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+2 -2
View File
@@ -21,6 +21,6 @@ contract c {
// ----
// test() -> 20, 10
// gas irOptimized: 159175
// gas legacy: 159459
// gas legacyOptimized: 153281
// gas legacy: 159279
// gas legacyOptimized: 152921
// storageEmpty -> 1
test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+2 -2
View File
@@ -13,5 +13,5 @@ contract c {
// ----
// test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
// gas irOptimized: 109503
// gas legacy: 127309
// gas legacyOptimized: 124136
// gas legacy: 126728
// gas legacyOptimized: 123444
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+2 -2
View File
@@ -19,6 +19,6 @@ contract c {
// ----
// test() -> true
// gas irOptimized: 196545
// gas legacy: 229864
// gas legacyOptimized: 210964
// gas legacy: 228685
// gas legacyOptimized: 209662
// storageEmpty -> 1
test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+2 -2
View File
@@ -18,6 +18,6 @@ contract c {
// ----
// test() ->
// gas irOptimized: 142640
// gas legacy: 165363
// gas legacyOptimized: 159446
// gas legacy: 164430
// gas legacyOptimized: 157898
// storageEmpty -> 1
test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+2 -2
View File
@@ -13,5 +13,5 @@ contract c {
// ----
// test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
// gas irOptimized: 108493
// gas legacy: 126187
// gas legacyOptimized: 123261
// gas legacy: 125610
// gas legacyOptimized: 122582
test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+1 -1
View File
@@ -14,6 +14,6 @@ contract C {
// compileViaYul: also
// ----
// f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
// gas irOptimized: 113267
// gas irOptimized: 113258
// gas legacy: 113686
// gas legacyOptimized: 113499
test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+1 -1
View File
@@ -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: 138732
// gas irOptimized: 138705
// gas legacy: 145150
// gas legacyOptimized: 139171
test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+3 -3
View File
@@ -17,6 +17,6 @@ contract c {
// compileViaYul: also
// ----
// test() -> 0
// gas irOptimized: 176848
// gas legacy: 218028
// gas legacyOptimized: 205124
// gas irOptimized: 176497
// gas legacy: 216790
// gas legacyOptimized: 203886
test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+2 -2
View File
@@ -16,5 +16,5 @@ contract C {
// ----
// f() ->
// gas irOptimized: 179590
// gas legacy: 180620
// gas legacyOptimized: 180403
// gas legacy: 180602
// gas legacyOptimized: 180385
test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+3 -3
View File
@@ -30,14 +30,14 @@ contract C {
// l() -> 0
// f(uint256,uint256): 42, 64 ->
// gas irOptimized: 112528
// gas legacy: 108234
// gas legacyOptimized: 102245
// gas legacy: 108105
// gas legacyOptimized: 101987
// l() -> 1
// ll(uint256): 0 -> 43
// a(uint256,uint256): 0, 42 -> 64
// f(uint256,uint256): 84, 128 ->
// gas irOptimized: 116400
// gas legacy: 107780
// gas legacy: 107525
// gas legacyOptimized: 96331
// l() -> 2
// ll(uint256): 1 -> 85
test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+2 -2
View File
@@ -24,8 +24,8 @@ contract C {
// l() -> 0
// g(uint256): 70 ->
// gas irOptimized: 185936
// gas legacy: 184991
// gas legacyOptimized: 180608
// gas legacy: 183811
// gas legacyOptimized: 179218
// l() -> 70
// a(uint256): 69 -> left(69)
// f() ->
test/libsolidity/semanticTests/array/reusing_memory.sol
+1 -1
View File
@@ -26,6 +26,6 @@ contract Main {
// compileViaYul: also
// ----
// f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
// gas irOptimized: 113613
// gas irOptimized: 113604
// gas legacy: 126596
// gas legacyOptimized: 113823
test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+3 -3
View File
@@ -11,9 +11,9 @@ contract c {
// compileViaYul: also
// ----
// (): 1, 2, 3, 4, 5 ->
// gas irOptimized: 155181
// gas legacy: 155254
// gas legacyOptimized: 155217
// gas irOptimized: 155170
// gas legacy: 155251
// gas legacyOptimized: 155214
// checkIfDataIsEmpty() -> false
// sendMessage() -> true, 0x40, 0
// checkIfDataIsEmpty() -> true
test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+1 -1
View File
@@ -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: 443989
// gas irOptimized: 443720
// gas legacy: 590683
// gas legacyOptimized: 448326
test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+3 -3
View File
@@ -26,6 +26,6 @@ contract Creator {
// compileViaYul: also
// ----
// f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
// gas irOptimized: 300837
// gas legacy: 428917
// gas legacyOptimized: 298128
// gas irOptimized: 300834
// gas legacy: 428711
// gas legacyOptimized: 297922
test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+2 -2
View File
@@ -11,7 +11,7 @@ contract Test {
// ----
// constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
// gas irOptimized: 291443
// gas legacy: 309842
// gas legacyOptimized: 260801
// gas legacy: 309607
// gas legacyOptimized: 260566
// m_x() -> 7
// m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+1 -1
View File
@@ -19,7 +19,7 @@ contract Main {
// compileViaYul: also
// ----
// constructor(): "abc", true
// gas irOptimized: 107175
// gas irOptimized: 106221
// gas legacy: 145838
// gas legacyOptimized: 104017
// getFlag() -> true
test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+1 -1
View File
@@ -12,7 +12,7 @@ contract C {
// compileViaYul: also
// ----
// constructor(): 1, 2, 3, 4 ->
// gas irOptimized: 174905
// gas irOptimized: 174041
// gas legacy: 221377
// gas legacyOptimized: 177671
// a() -> 1
test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+1 -1
View File
@@ -19,6 +19,6 @@ contract C {
// compileViaYul: also
// ----
// f(), 2000 ether -> true
// gas irOptimized: 123037
// gas irOptimized: 120036
// gas legacy: 123226
// gas legacyOptimized: 123092
test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+1 -1
View File
@@ -15,5 +15,5 @@ contract B is A {
// compileViaYul: true
// ----
// constructor() ->
// gas irOptimized: 122017
// gas irOptimized: 121153
// y() -> 42
test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+1 -1
View File
@@ -12,7 +12,7 @@ contract B is A {
// compileViaYul: also
// ----
// constructor() ->
// gas irOptimized: 122017
// gas irOptimized: 121153
// gas legacy: 135046
// gas legacyOptimized: 116176
// y() -> 42
test/libsolidity/semanticTests/constructor_with_params.sol
+1 -1
View File
@@ -11,7 +11,7 @@ contract C {
// compileViaYul: also
// ----
// constructor(): 2, 0 ->
// gas irOptimized: 104227
// gas irOptimized: 103290
// gas legacy: 117158
// i() -> 2
// k() -> 0
test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+1 -1
View File
@@ -23,7 +23,7 @@ contract D is B, C {
// compileViaYul: also
// ----
// constructor(): 2, 0 ->
// gas irOptimized: 160166
// gas irOptimized: 160093
// gas legacy: 170665
// gas legacyOptimized: 145396
// i() -> 2
test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+1 -1
View File
@@ -14,7 +14,7 @@ contract D is C {
// compileViaYul: also
// ----
// constructor(): 2, 0 ->
// gas irOptimized: 124844
// gas irOptimized: 123907
// gas legacy: 139250
// gas legacyOptimized: 119367
// i() -> 2
test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+1 -1
View File
@@ -17,7 +17,7 @@ contract C {
// compileViaYul: also
// ----
// constructor() ->
// gas irOptimized: 173672
// gas irOptimized: 172802
// gas legacy: 250376
// gas legacyOptimized: 174522
// deposit(bytes32), 18 wei: 0x1234 ->
test/libsolidity/semanticTests/events/event_indexed_string.sol
+2 -2
View File
@@ -20,5 +20,5 @@ contract C {
// deposit() ->
// ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
// gas irOptimized: 343396
// gas legacy: 390742
// gas legacyOptimized: 376774
// gas legacy: 388679
// gas legacyOptimized: 374441
test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+3 -3
View File
@@ -76,9 +76,9 @@ contract FixedFeeRegistrar is Registrar {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 413485
// gas legacy: 936897
// gas legacyOptimized: 490983
// gas irOptimized: 413269
// gas legacy: 935817
// gas legacyOptimized: 489951
// reserve(string), 69 ether: 0x20, 3, "abc" ->
// ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
// gas irOptimized: 45967
test/libsolidity/semanticTests/externalContracts/base64.sol
+6 -6
View File
@@ -35,8 +35,8 @@ contract test {
// ----
// constructor()
// gas irOptimized: 450044
// gas legacy: 766936
// gas legacyOptimized: 543094
// gas legacy: 765640
// gas legacyOptimized: 541810
// encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
// encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -53,9 +53,9 @@ contract test {
// encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
// encode_inline_asm_large()
// gas irOptimized: 1385047
// gas legacy: 1658033
// gas legacyOptimized: 1210033
// gas legacy: 1652033
// gas legacyOptimized: 1201033
// encode_no_asm_large()
// gas irOptimized: 3335101
// gas legacy: 4801077
// gas legacyOptimized: 2929077
// gas legacy: 4777077
// gas legacyOptimized: 2890077
test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+11 -11
View File
@@ -178,35 +178,35 @@ contract DepositContract is IDepositContract, ERC165 {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 1543359
// gas legacy: 2436584
// gas legacyOptimized: 1776483
// gas irOptimized: 1542927
// gas legacy: 2435803
// gas legacyOptimized: 1775425
// supportsInterface(bytes4): 0x0 -> 0
// supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
// supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
// supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
// get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
// gas irOptimized: 122135
// gas legacy: 150465
// gas legacyOptimized: 122798
// gas legacy: 150273
// gas legacyOptimized: 122510
// get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
// deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
// get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
// gas irOptimized: 122135
// gas legacy: 150465
// gas legacyOptimized: 122798
// gas legacy: 150273
// gas legacyOptimized: 122510
// get_deposit_count() -> 0x20, 8, 0
// deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
// ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
// get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
// gas irOptimized: 122114
// gas legacy: 150475
// gas legacyOptimized: 122811
// gas legacy: 150283
// gas legacyOptimized: 122523
// get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
// deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
// ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
// get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
// gas irOptimized: 122114
// gas legacy: 150475
// gas legacyOptimized: 122811
// gas legacy: 150283
// gas legacyOptimized: 122523
// get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+3 -3
View File
@@ -50,9 +50,9 @@ contract test {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 1938339
// gas legacy: 2480887
// gas legacyOptimized: 1874490
// gas irOptimized: 1937251
// gas legacy: 2478955
// gas legacyOptimized: 1877737
// div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
// gas irOptimized: 22137
// gas legacy: 22767
test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+3 -3
View File
@@ -50,9 +50,9 @@ contract test {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 1792108
// gas legacy: 2250130
// gas legacyOptimized: 1746528
// gas irOptimized: 1791688
// gas legacy: 2248594
// gas legacyOptimized: 1749096
// div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
// gas irOptimized: 22004
// gas legacy: 22497
test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+3 -3
View File
@@ -35,9 +35,9 @@ contract test {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 465789
// gas legacy: 672749
// gas legacyOptimized: 479606
// gas irOptimized: 464709
// gas legacy: 671453
// gas legacyOptimized: 480242
// prb_pi() -> 3141592656369545286
// gas irOptimized: 57478
// gas legacy: 98903
test/libsolidity/semanticTests/externalContracts/snark.sol
+1 -1
View File
@@ -298,5 +298,5 @@ contract Test {
// verifyTx() -> true
// ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
// gas irOptimized: 95261
// gas legacy: 114094
// gas legacy: 113731
// gas legacyOptimized: 83670
test/libsolidity/semanticTests/externalContracts/strings.sol
+6 -6
View File
@@ -51,9 +51,9 @@ contract test {
// compileViaYul: also
// ----
// constructor()
// gas irOptimized: 707330
// gas legacy: 1130761
// gas legacyOptimized: 750416
// gas irOptimized: 704522
// gas legacy: 1127730
// gas legacyOptimized: 753807
// toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
// gas irOptimized: 22660
// gas legacy: 23190
@@ -71,6 +71,6 @@ contract test {
// gas legacy: 31621
// gas legacyOptimized: 27914
// benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
// gas irOptimized: 2040045
// gas legacy: 4381235
// gas legacyOptimized: 2317529
// gas irOptimized: 2040024
// gas legacy: 4356286
// gas legacyOptimized: 2268278

Some files were not shown because too many files have changed in this diff Show More