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

Remove memoryguard calls from command line test expectations.

Browse Source
This commit is contained in:
Daniel Kirchner 2020-10-15 16:25:15 +02:00
parent 82876fd00e
commit 2e984a3651
15 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/cmdlineTests/exp_base_literal/output
View File

@ -9,7 +9,7 @@ IR:
object "C_80" { object "C_80" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_80() constructor_C_80()
@ -25,7 +25,7 @@ object "C_80" {
} }
object "C_80_deployed" { object "C_80_deployed" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

8
test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "C_6" { object "C_6" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("C_6_deployed") let _1 := datasize("C_6_deployed")
codecopy(0, dataoffset("C_6_deployed"), _1) codecopy(0, dataoffset("C_6_deployed"), _1)
@ -19,7 +19,7 @@ object "C_6" {
object "C_6_deployed" { object "C_6_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
revert(0, 0) revert(0, 0)
} }
} }
@ -37,7 +37,7 @@ Optimized IR:
object "D_9" { object "D_9" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("D_9_deployed") let _1 := datasize("D_9_deployed")
codecopy(0, dataoffset("D_9_deployed"), _1) codecopy(0, dataoffset("D_9_deployed"), _1)
@ -47,7 +47,7 @@ object "D_9" {
object "D_9_deployed" { object "D_9_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
revert(0, 0) revert(0, 0)
} }
} }

33
test/cmdlineTests/ir_compiler_subobjects/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "C_2" { object "C_2" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("C_2_deployed") let _1 := datasize("C_2_deployed")
codecopy(0, dataoffset("C_2_deployed"), _1) codecopy(0, dataoffset("C_2_deployed"), _1)
@ -19,7 +19,7 @@ object "C_2" {
object "C_2_deployed" { object "C_2_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
revert(0, 0) revert(0, 0)
} }
} }
@ -37,7 +37,7 @@ Optimized IR:
object "D_13" { object "D_13" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("D_13_deployed") let _1 := datasize("D_13_deployed")
codecopy(0, dataoffset("D_13_deployed"), _1) codecopy(0, dataoffset("D_13_deployed"), _1)
@ -47,21 +47,20 @@ object "D_13" {
object "D_13_deployed" { object "D_13_deployed" {
code { code {
{ {
let _1 := memoryguard(0x80) mstore(64, 128)
mstore(64, _1)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let _2 := 0 let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_2))) if eq(0x26121ff0, shr(224, calldataload(_1)))
{ {
if callvalue() { revert(_2, _2) } if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
let _3 := datasize("C_2") let _2 := datasize("C_2")
let _4 := add(_1, _3) let _3 := add(128, _2)
if or(gt(_4, 0xffffffffffffffff), lt(_4, _1)) { invalid() } if or(gt(_3, 0xffffffffffffffff), lt(_3, 128)) { invalid() }
datacopy(_1, dataoffset("C_2"), _3) datacopy(128, dataoffset("C_2"), _2)
pop(create(_2, _1, sub(_4, _1))) pop(create(_1, 128, _2))
return(allocateMemory(_2), _2) return(allocateMemory(_1), _1)
} }
} }
revert(0, 0) revert(0, 0)
@ -77,7 +76,7 @@ object "D_13" {
object "C_2" { object "C_2" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("C_2_deployed") let _1 := datasize("C_2_deployed")
codecopy(0, dataoffset("C_2_deployed"), _1) codecopy(0, dataoffset("C_2_deployed"), _1)
@ -87,7 +86,7 @@ object "D_13" {
object "C_2_deployed" { object "C_2_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
revert(0, 0) revert(0, 0)
} }
} }

16
test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
View File

@ -19,18 +19,16 @@ object "D_11" {
object "D_11_deployed" { object "D_11_deployed" {
code { code {
{ {
let _1 := memoryguard(0x80) mstore(64, 128)
mstore(64, _1)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let _2 := 0 let _1 := 0
if eq(0x26121ff0, shr(224, calldataload(_2))) if eq(0x26121ff0, shr(224, calldataload(_1)))
{ {
if callvalue() { revert(_2, _2) } if callvalue() { revert(_1, _1) }
if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) } if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
if gt(_1, 0xffffffffffffffff) { invalid() } mstore(64, 128)
mstore(64, _1) return(128, _1)
return(_1, _2)
} }
} }
revert(0, 0) revert(0, 0)

2
test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "D_7" { object "D_7" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("D_7_deployed") let _1 := datasize("D_7_deployed")
codecopy(0, dataoffset("D_7_deployed"), _1) codecopy(0, dataoffset("D_7_deployed"), _1)

4
test/cmdlineTests/name_simplifier/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "C_56" { object "C_56" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("C_56_deployed") let _1 := datasize("C_56_deployed")
codecopy(0, dataoffset("C_56_deployed"), _1) codecopy(0, dataoffset("C_56_deployed"), _1)
@ -19,7 +19,7 @@ object "C_56" {
object "C_56_deployed" { object "C_56_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let _1 := 0 let _1 := 0

4
test/cmdlineTests/optimizer_array_sload/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "Arraysum_33" { object "Arraysum_33" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
let _1 := datasize("Arraysum_33_deployed") let _1 := datasize("Arraysum_33_deployed")
codecopy(0, dataoffset("Arraysum_33_deployed"), _1) codecopy(0, dataoffset("Arraysum_33_deployed"), _1)
@ -19,7 +19,7 @@ object "Arraysum_33" {
object "Arraysum_33_deployed" { object "Arraysum_33_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let _1 := 0 let _1 := 0

4
test/cmdlineTests/standard_irOptimized_requested/output.json
View File

@ -7,7 +7,7 @@
object \"C_6\" { object \"C_6\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_6() constructor_C_6()
codecopy(0, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\")) codecopy(0, dataoffset(\"C_6_deployed\"), datasize(\"C_6_deployed\"))
@ -17,7 +17,7 @@ object \"C_6\" {
} }
object \"C_6_deployed\" { object \"C_6_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let selector := shift_right_224_unsigned(calldataload(0)) let selector := shift_right_224_unsigned(calldataload(0))

4
test/cmdlineTests/standard_ir_requested/output.json
View File

@ -8,7 +8,7 @@
object \"C_6\" { object \"C_6\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_6() constructor_C_6()
@ -24,7 +24,7 @@ object \"C_6\" {
} }
object \"C_6_deployed\" { object \"C_6_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

4
test/cmdlineTests/yul_optimizer_steps/output
View File

@ -9,7 +9,7 @@ Optimized IR:
object "C_6" { object "C_6" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
codecopy(0, dataoffset("C_6_deployed"), datasize("C_6_deployed")) codecopy(0, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
return(0, datasize("C_6_deployed")) return(0, datasize("C_6_deployed"))
@ -18,7 +18,7 @@ object "C_6" {
object "C_6_deployed" { object "C_6_deployed" {
code { code {
{ {
mstore(64, memoryguard(0x80)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {
let selector := shift_right_224_unsigned(calldataload(0)) let selector := shift_right_224_unsigned(calldataload(0))

4
test/cmdlineTests/yul_string_format_ascii/output.json
View File

@ -8,7 +8,7 @@
object \"C_10\" { object \"C_10\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_10() constructor_C_10()
@ -24,7 +24,7 @@ object \"C_10\" {
} }
object \"C_10_deployed\" { object \"C_10_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

4
test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
View File

@ -8,7 +8,7 @@
object \"C_10\" { object \"C_10\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_10() constructor_C_10()
@ -24,7 +24,7 @@ object \"C_10\" {
} }
object \"C_10_deployed\" { object \"C_10_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

4
test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
View File

@ -8,7 +8,7 @@
object \"C_10\" { object \"C_10\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_10() constructor_C_10()
@ -24,7 +24,7 @@ object \"C_10\" {
} }
object \"C_10_deployed\" { object \"C_10_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

4
test/cmdlineTests/yul_string_format_ascii_long/output.json
View File

@ -8,7 +8,7 @@
object \"C_10\" { object \"C_10\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_10() constructor_C_10()
@ -24,7 +24,7 @@ object \"C_10\" {
} }
object \"C_10_deployed\" { object \"C_10_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {

4
test/cmdlineTests/yul_string_format_hex/output.json
View File

@ -8,7 +8,7 @@
object \"C_10\" { object \"C_10\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if callvalue() { revert(0, 0) } if callvalue() { revert(0, 0) }
constructor_C_10() constructor_C_10()
@ -24,7 +24,7 @@ object \"C_10\" {
} }
object \"C_10_deployed\" { object \"C_10_deployed\" {
code { code {
mstore(64, memoryguard(128)) mstore(64, 128)
if iszero(lt(calldatasize(), 4)) if iszero(lt(calldatasize(), 4))
{ {