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

Allow arrays of contract types as type expressions e.g. for abi.decode.

Browse Source
This commit is contained in:
Daniel Kirchner 2020-10-15 20:00:22 +02:00
parent eedd12ad1d
commit 909ce9164a
7 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -22,6 +22,7 @@ Bugfixes:
* Code generator: Fix internal compiler error when referencing members via module name but not using the reference.
* Code generator: Fix ``ABIEncoderV2`` pragma from the current module affecting inherited functions and applied modifiers.
* Code generator: Use revert instead of invalid opcode for out-of-bounds array index access in getter.
* Type Checker: Allow arrays of contract types as type expressions and as arguments for ``abi.decode``.
* Type Checker: Disallow invalid use of library names as type name.
* Type Checker: Fix internal compiler error caused by storage parameters with nested mappings in libraries.
* Name Resolver: Fix shadowing/same-name warnings for later declarations.

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -2915,8 +2915,9 @@ bool TypeChecker::visit(IndexAccess const& _access)
case Type::Category::TypeType:
{
TypeType const& typeType = dynamic_cast<TypeType const&>(*baseType);
if (dynamic_cast<ContractType const*>(typeType.actualType()))
m_errorReporter.typeError(2876_error, _access.location(), "Index access for contracts or libraries is not possible.");
if (auto const* contractType = dynamic_cast<ContractType const*>(typeType.actualType()))
if (contractType->contractDefinition().isLibrary())
m_errorReporter.typeError(2876_error, _access.location(), "Index access for library types and arrays of libraries are not possible.");
if (!index)
resultType = TypeProvider::typeType(TypeProvider::array(DataLocation::Memory, typeType.actualType()));
else

8
test/libsolidity/syntaxTests/array/contract_index_access.sol Normal file
View File

@ -0,0 +1,8 @@
contract C {
function f() view public {
C[0];
}
}
// ----
// Warning 6133: (52-56): Statement has no effect.
// Warning 2018: (17-63): Function state mutability can be restricted to pure

7
test/libsolidity/syntaxTests/array/invalid/contract_index_access.sol
View File

@ -1,7 +0,0 @@
contract C {
function f() view public {
C[0];
}
}
// ----
// TypeError 2876: (52-56): Index access for contracts or libraries is not possible.

2
test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
View File

@ -4,4 +4,4 @@ library C {
}
}
// ----
// TypeError 2876: (51-55): Index access for contracts or libraries is not possible.
// TypeError 2876: (51-55): Index access for library types and arrays of libraries are not possible.

1
test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
View File

@ -3,4 +3,3 @@ contract s{}
function f() {s[:][];}
// ----
// TypeError 1760: (53-57): Types cannot be sliced.
// TypeError 2876: (53-59): Index access for contracts or libraries is not possible.

5
test/libsolidity/syntaxTests/specialFunctions/abidecode/contract_array.sol Normal file
View File

@ -0,0 +1,5 @@
contract C {
function f(bytes calldata x) public pure returns (C[] memory c) {
c = abi.decode(x, (C[]));
}
}