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 #10458 from ethereum/fixMergeProblems

Browse Source 
Fix tests after merge.
This commit is contained in:
chriseth 2020-12-01 16:08:51 +01:00 committed by GitHub
commit edfae1ed05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
View File

@ -8,8 +8,6 @@ contract C {
return b + c; return b + c;
} }
} }
// ====
// compileViaYul: also
// ---- // ----
// f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> 58626 // f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> 58626
// f(uint16,uint16,uint16): 0x1000, 0xe500, 0xe000 -> FAILURE, hex"4e487b71", 0x11 // f(uint16,uint16,uint16): 0x1000, 0xe500, 0xe000 -> FAILURE, hex"4e487b71", 0x11

2
test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
View File

@ -15,4 +15,4 @@ contract C {
// compileViaYul: also // compileViaYul: also
// ---- // ----
// f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" -> // f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" ->
// f(bytes[2]): 0x20, 0x40, 0x40, 1, "a" -> FAILURE // f(bytes[2]): 0x20, 0x40, 0x40, 1, "a" -> FAILURE, hex"4e487b71", 0x01