cerc-io/solidity
16
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

Disallow calldata arrays with dynamically encoded base types in TypeChecker.

Browse Source
This commit is contained in:
Daniel Kirchner 2019-02-11 17:13:12 +01:00
parent 92cb6cb793
commit 9e32aa7510
7 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsolidity/analysis/TypeChecker.cpp
View File

@ -366,6 +366,16 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
for (ASTPointer<VariableDeclaration> const& var: _function.parameters()) for (ASTPointer<VariableDeclaration> const& var: _function.parameters())
{ {
TypePointer baseType = type(*var); TypePointer baseType = type(*var);
if (auto const* arrayType = dynamic_cast<ArrayType const*>(baseType.get()))
{
baseType = arrayType->baseType();
if (
!m_scope->isInterface() &&
baseType->dataStoredIn(DataLocation::CallData) &&
baseType->isDynamicallyEncoded()
)
m_errorReporter.typeError(var->location(), "Calldata arrays with dynamically encoded base types are not yet supported.");
}
while (auto const* arrayType = dynamic_cast<ArrayType const*>(baseType.get())) while (auto const* arrayType = dynamic_cast<ArrayType const*>(baseType.get()))
baseType = arrayType->baseType(); baseType = arrayType->baseType();

16
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -8013,6 +8013,22 @@ BOOST_AUTO_TEST_CASE(struct_named_constructor)
ABI_CHECK(callContractFunction("s()"), encodeArgs(u256(1), true)); ABI_CHECK(callContractFunction("s()"), encodeArgs(u256(1), true));
} }
BOOST_AUTO_TEST_CASE(calldata_array)
{
char const* sourceCode = R"(
pragma experimental ABIEncoderV2;
contract C {
function f(uint[2] calldata s) external pure returns (uint256 a, uint256 b) {
a = s[0];
b = s[1];
}
}
)";
compileAndRun(sourceCode, 0, "C");
ABI_CHECK(callContractFunction("f(uint256[2])", encodeArgs(u256(42), u256(23))), encodeArgs(u256(42), u256(23)));
}
BOOST_AUTO_TEST_CASE(calldata_struct) BOOST_AUTO_TEST_CASE(calldata_struct)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(

6
test/libsolidity/syntaxTests/array/calldata.sol Normal file
View File

@ -0,0 +1,6 @@
pragma experimental ABIEncoderV2;
contract Test {
function f(uint[3] calldata) external { }
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

6
test/libsolidity/syntaxTests/array/calldata_dynamic.sol Normal file
View File

@ -0,0 +1,6 @@
pragma experimental ABIEncoderV2;
contract Test {
function f(uint[] calldata) external { }
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

6
test/libsolidity/syntaxTests/array/calldata_multi.sol Normal file
View File

@ -0,0 +1,6 @@
pragma experimental ABIEncoderV2;
contract Test {
function f(uint[3][4] calldata) external { }
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.

7
test/libsolidity/syntaxTests/array/calldata_multi_dynamic.sol Normal file
View File

@ -0,0 +1,7 @@
pragma experimental ABIEncoderV2;
contract Test {
function f(uint[][] calldata) external { }
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
// TypeError: (65-82): Calldata arrays with dynamically encoded base types are not yet supported.

1
test/libsolidity/syntaxTests/structs/array_calldata.sol
View File

@ -6,3 +6,4 @@ contract Test {
} }
// ---- // ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments. // Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
// TypeError: (131-145): Calldata arrays with dynamically encoded base types are not yet supported.