Skip to content

Commit

Permalink
Update other test expectations
Browse files Browse the repository at this point in the history
  • Loading branch information
@cameel
cameel committed Apr 22, 2024
1 parent 9a6d50c commit 2703127
Show file tree
Hide file tree
Showing 28 changed files with 960 additions and 973 deletions.
62 changes: 34 additions & 28 deletions test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
View file
Expand Up @@ -428,65 +428,71 @@ object "D_27" {
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
let _1 := memoryguard(0x80)
let _2 := 64
mstore(_2, _1)
mstore(64, _1)
if iszero(lt(calldatasize(), 4))
{
if eq(0x26121ff0, shr(224, calldataload(0)))
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
/// @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..."
let _3 := datasize("C_2")
let _4 := add(_1, _3)
let _5 := 0xffffffffffffffff
if or(gt(_4, _5), lt(_4, _1))
let _2 := datasize("C_2")
let _3 := add(_1, _2)
if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
/// @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..."
datacopy(_1, dataoffset("C_2"), _3)
if iszero(create(/** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _1, sub(_4, _1)))
datacopy(_1, dataoffset("C_2"), _2)
if iszero(create(/** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _1, sub(_3, _1)))
{
/// @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..."
let pos := mload(_2)
let pos := mload(64)
returndatacopy(pos, 0, returndatasize())
revert(pos, returndatasize())
}
let memPtr := mload(_2)
let newFreePtr := add(memPtr, _2)
if or(gt(newFreePtr, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _5), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
let memPtr := 0
let size := 0
size := 0
let memPtr_1 := mload(64)
let newFreePtr := add(memPtr_1, 64)
if or(gt(newFreePtr, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr_1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr)
mstore(memPtr, 2)
mstore(add(memPtr, 32), "/*")
let memPtr_1 := mload(_2)
let newFreePtr_1 := add(memPtr_1, 96)
if or(gt(newFreePtr_1, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ _5), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
mstore(64, newFreePtr)
memPtr := memPtr_1
mstore(memPtr_1, 2)
mstore(add(memPtr_1, 32), "/*")
let memPtr_2 := 0
let size_1 := 0
size_1 := 0
let memPtr_3 := mload(64)
let newFreePtr_1 := add(memPtr_3, 96)
if or(gt(newFreePtr_1, /** @src 0:446:491 "new /// @src 0:149:156 \"new C()\"..." */ 0xffffffffffffffff), /** @src 0:279:599 "contract D /** @src 0:96:165 \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_3))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr_1)
mstore(memPtr_1, 39)
let _6 := add(memPtr_1, 32)
mstore(_6, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
let memPos := mload(_2)
mstore(64, newFreePtr_1)
memPtr_2 := memPtr_3
mstore(memPtr_3, 39)
let _4 := add(memPtr_3, 32)
mstore(_4, 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
mstore(add(memPtr_3, 64), shl(200, 0x2e2e2e22202a2f))
let memPos := mload(64)
mstore(memPos, 32)
let length := mload(memPtr_1)
let length := mload(memPtr_3)
mstore(add(memPos, 32), length)
mcopy(add(memPos, _2), _6, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
mcopy(add(memPos, 64), _4, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down
4 changes: 2 additions & 2 deletions test/cmdlineTests/function_debug_info/output
View file
Expand Up @@ -41,7 +41,7 @@
},
"abi_decode_tuple_t_uint256":
{
"entryPoint": 269,
"entryPoint": 271,
"parameterSlots": 2,
"returnSlots": 1
},
Expand All @@ -52,7 +52,7 @@
},
"panic_error_0x32":
{
"entryPoint": 292,
"entryPoint": 294,
"parameterSlots": 0,
"returnSlots": 0
}
Expand Down
17 changes: 8 additions & 9 deletions test/cmdlineTests/mcopy_bytes_array_returned_from_function/output
View file
Expand Up @@ -22,25 +22,24 @@ object "C_14" {
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
let newFreePtr := add(_1, 64)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 36)
}
mstore(_2, newFreePtr)
mstore(64, newFreePtr)
mstore(_1, 5)
let _3 := add(_1, 0x20)
mstore(_3, "aaaaa")
let memPos := mload(_2)
let _2 := add(_1, 0x20)
mstore(_2, "aaaaa")
let memPos := mload(64)
mstore(memPos, 0x20)
let length := mload(_1)
mstore(add(memPos, 0x20), length)
mcopy(add(memPos, _2), _3, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
mcopy(add(memPos, 64), _2, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down
17 changes: 8 additions & 9 deletions test/cmdlineTests/mcopy_string_literal_returned_from_function/output
View file
Expand Up @@ -22,25 +22,24 @@ object "C_10" {
{
if callvalue() { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
let _2 := 64
let newFreePtr := add(_1, _2)
let newFreePtr := add(_1, 64)
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(4, 0x41)
revert(0, 0x24)
}
mstore(_2, newFreePtr)
mstore(64, newFreePtr)
mstore(_1, 25)
let _3 := add(_1, 0x20)
mstore(_3, "MCOPY on Cancun vacation.")
let memPos := mload(_2)
let _2 := add(_1, 0x20)
mstore(_2, "MCOPY on Cancun vacation.")
let memPos := mload(64)
mstore(memPos, 0x20)
let length := mload(_1)
mstore(add(memPos, 0x20), length)
mcopy(add(memPos, _2), _3, length)
mstore(add(add(memPos, length), _2), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
mcopy(add(memPos, 64), _2, length)
mstore(add(add(memPos, length), 64), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), 64))
}
}
revert(0, 0)
Expand Down
134 changes: 69 additions & 65 deletions test/cmdlineTests/name_simplifier/output
View file
Expand Up @@ -17,100 +17,104 @@ object "C_59" {
code {
{
/// @src 0:346:625 "contract C {..."
let _1 := memoryguard(0x80)
let _2 := 4
if iszero(lt(calldatasize(), _2))
mstore(64, memoryguard(0x80))
if iszero(lt(calldatasize(), 4))
{
if eq(0xf8eddcc6, shr(224, calldataload(0)))
{
if callvalue() { revert(0, 0) }
let _3 := 32
if slt(add(calldatasize(), not(3)), _3) { revert(0, 0) }
let offset := calldataload(_2)
let _4 := 0xffffffffffffffff
if gt(offset, _4) { revert(0, 0) }
if slt(add(calldatasize(), not(3)), 32) { revert(0, 0) }
let offset := calldataload(4)
if gt(offset, 0xffffffffffffffff) { revert(0, 0) }
if iszero(slt(add(offset, 35), calldatasize())) { revert(0, 0) }
let _5 := calldataload(add(_2, offset))
let _6 := 36
if gt(_5, _4)
let _1 := calldataload(add(4, offset))
if gt(_1, 0xffffffffffffffff)
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x41)
revert(0, _6)
mstore(4, 0x41)
revert(0, 36)
}
let _7 := shl(5, _5)
let _8 := not(31)
let newFreePtr := add(_1, and(add(_7, 63), _8))
if or(gt(newFreePtr, _4), lt(newFreePtr, _1))
let _2 := shl(5, _1)
let memPtr := 0
memPtr := mload(64)
let newFreePtr := add(memPtr, and(add(_2, 63), not(31)))
if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr))
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x41)
revert(0, _6)
mstore(4, 0x41)
revert(0, 36)
}
let _9 := 64
mstore(_9, newFreePtr)
let dst := _1
mstore(_1, _5)
dst := add(_1, _3)
mstore(64, newFreePtr)
let dst := memPtr
mstore(memPtr, _1)
dst := add(memPtr, 32)
let dst_1 := dst
let srcEnd := add(add(offset, _7), _6)
let srcEnd := add(add(offset, _2), 36)
if gt(srcEnd, calldatasize()) { revert(0, 0) }
let src := add(offset, _6)
for { } lt(src, srcEnd) { src := add(src, _3) }
let src := add(offset, 36)
for { } lt(src, srcEnd) { src := add(src, 32) }
{
if slt(sub(calldatasize(), src), _3) { revert(0, 0) }
let memPtr := mload(_9)
let newFreePtr_1 := add(memPtr, _3)
if or(gt(newFreePtr_1, _4), lt(newFreePtr_1, memPtr))
if slt(sub(calldatasize(), src), 32) { revert(0, 0) }
let memPtr_1 := 0
memPtr_1 := mload(64)
let newFreePtr_1 := add(memPtr_1, 32)
if or(gt(newFreePtr_1, 0xffffffffffffffff), lt(newFreePtr_1, memPtr_1))
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x41)
revert(0, _6)
mstore(4, 0x41)
revert(0, 36)
}
mstore(_9, newFreePtr_1)
mstore(memPtr, calldataload(src))
mstore(dst, memPtr)
dst := add(dst, _3)
mstore(64, newFreePtr_1)
mstore(memPtr_1, calldataload(src))
mstore(dst, memPtr_1)
dst := add(dst, 32)
}
if iszero(mload(_1))
/// @src 0:469:474 "_s[0]"
let addr := /** @src 0:346:625 "contract C {..." */ 0
if iszero(mload(memPtr))
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x32)
revert(0, _6)
mstore(4, 0x32)
revert(0, 36)
}
addr := dst_1
sstore(0, mload(/** @src 0:469:474 "_s[0]" */ mload(dst_1)))
/// @src 0:346:625 "contract C {..."
if iszero(lt(/** @src 0:492:493 "1" */ 0x01, /** @src 0:346:625 "contract C {..." */ mload(_1)))
/// @src 0:489:494 "_s[1]"
let addr_1 := /** @src 0:346:625 "contract C {..." */ 0
if iszero(lt(/** @src 0:492:493 "1" */ 0x01, /** @src 0:346:625 "contract C {..." */ mload(memPtr)))
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x32)
revert(0, _6)
mstore(4, 0x32)
revert(0, 36)
}
let _10 := mload(/** @src 0:489:494 "_s[1]" */ mload(/** @src 0:346:625 "contract C {..." */ add(_1, _9)))
sstore(0x02, _10)
let memPtr_1 := mload(_9)
let newFreePtr_2 := add(memPtr_1, 160)
if or(gt(newFreePtr_2, _4), lt(newFreePtr_2, memPtr_1))
addr_1 := add(memPtr, 64)
let _3 := mload(/** @src 0:489:494 "_s[1]" */ mload(addr_1))
/// @src 0:346:625 "contract C {..."
sstore(0x02, _3)
let memPtr_2 := 0
memPtr_2 := mload(64)
let newFreePtr_2 := add(memPtr_2, 160)
if or(gt(newFreePtr_2, 0xffffffffffffffff), lt(newFreePtr_2, memPtr_2))
{
mstore(0, shl(224, 0x4e487b71))
mstore(_2, 0x41)
revert(0, _6)
mstore(4, 0x41)
revert(0, 36)
}
mstore(_9, newFreePtr_2)
mstore(memPtr_1, 100)
let _11 := add(memPtr_1, _3)
mstore(_11, "longstringlongstringlongstringlo")
mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
mstore(add(memPtr_1, 96), "stringlongstringlongstringlongst")
mstore(add(memPtr_1, 128), "ring")
let memPos := mload(_9)
mstore(memPos, _10)
mstore(add(memPos, _3), _9)
let length := mload(memPtr_1)
mstore(add(memPos, _9), length)
mcopy(add(memPos, 96), _11, length)
mstore(64, newFreePtr_2)
mstore(memPtr_2, 100)
let _4 := add(memPtr_2, 32)
mstore(_4, "longstringlongstringlongstringlo")
mstore(add(memPtr_2, 64), "ngstringlongstringlongstringlong")
mstore(add(memPtr_2, 96), "stringlongstringlongstringlongst")
mstore(add(memPtr_2, 128), "ring")
let memPos := mload(64)
mstore(memPos, _3)
mstore(add(memPos, 32), 64)
let length := mload(memPtr_2)
mstore(add(memPos, 64), length)
mcopy(add(memPos, 96), _4, length)
mstore(add(add(memPos, length), 96), 0)
return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), 96))
return(memPos, add(sub(add(memPos, and(add(length, 0x1f), not(31))), memPos), 96))
}
}
revert(0, 0)
Expand Down

0 comments on commit 2703127

Please sign in to comment.