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 #11396 from ethereum/v1-yul

Browse Source 
Add sanity check into SemanticTest for not allowing ABIEncoderV1Only and compileViaYul together
This commit is contained in:
Alex Beregszaszi 2021-05-14 20:38:27 +01:00 committed by GitHub
commit f58d58738e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/libsolidity/SemanticTest.cpp
View File

@ -99,6 +99,14 @@ SemanticTest::SemanticTest(
if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1) if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
m_shouldRun = false; m_shouldRun = false;
// Sanity check
if (m_runWithABIEncoderV1Only && (compileViaYul == "true" || compileViaYul == "also"))
BOOST_THROW_EXCEPTION(runtime_error(
"ABIEncoderV1Only can not be used with compileViaYul=" + compileViaYul +
", set it to false or omit the flag. The compileViaYul setting ignores the abicoder pragma"
" and runs everything with ABICoder V2."
));
auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default")); auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
soltestAssert(revertStrings, "Invalid revertStrings setting."); soltestAssert(revertStrings, "Invalid revertStrings setting.");
m_revertStrings = revertStrings.value(); m_revertStrings = revertStrings.value();

1
test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string.sol
View File

@ -6,7 +6,6 @@ contract C {
} }
} }
// ==== // ====
// compileViaYul: also
// ABIEncoderV1Only: true // ABIEncoderV1Only: true
// ---- // ----
// f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0 // f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0

0
test/libsolidity/semanticTests/arithmetics/checked_add.sol → test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
View File

13
test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol Normal file
View File

@ -0,0 +1,13 @@
pragma abicoder v2;
contract C {
function f(uint16 a, uint16 b) public returns (uint16) {
return a + b;
}
}
// ====
// compileViaYul: also
// ----
// f(uint16,uint16): 65534, 0 -> 0xfffe
// f(uint16,uint16): 65536, 0 -> FAILURE
// f(uint16,uint16): 65535, 0 -> 0xffff
// f(uint16,uint16): 65535, 1 -> FAILURE, hex"4e487b71", 0x11

18
test/libsolidity/semanticTests/revertStrings/empty_v1_yul.sol
View File

@ -1,18 +0,0 @@
contract C {
function f() public {
revert("");
}
function g(string calldata msg) public {
revert(msg);
}
}
// ====
// ABIEncoderV1Only: true
// EVMVersion: >=byzantium
// compileViaYul: true
// revertStrings: debug
// ----
// f() -> FAILURE, hex"08c379a0", 0x20, 0
// g(string): "" -> FAILURE, hex"08c379a0", 0x20, 0
// g(string): 0x20, 0, "" -> FAILURE, hex"08c379a0", 0x20, 0
// g(string): 0x20, 0 -> FAILURE, hex"08c379a0", 0x20, 0