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

Fix multi-dimensional arrays in the ABI.

Browse Source
This commit is contained in:
chriseth 2018-02-19 18:21:02 +01:00
parent 7540763196
commit 08b6a72d37
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libsolidity/analysis/TypeChecker.cpp
View File

@ -34,6 +34,29 @@ using namespace std;
using namespace dev; using namespace dev;
using namespace dev::solidity; using namespace dev::solidity;
namespace
{
bool typeSupportedByOldABIEncoder(Type const& _type)
{
if (_type.dataStoredIn(DataLocation::Storage))
return true;
else if (_type.category() == Type::Category::Struct)
return false;
else if (_type.category() == Type::Category::Array)
{
auto const& arrayType = dynamic_cast<ArrayType const&>(_type);
auto base = arrayType.baseType();
if (!typeSupportedByOldABIEncoder(*base))
return false;
else if (base->category() == Type::Category::Array && base->isDynamicallySized())
return false;
}
return true;
}
}
bool TypeChecker::checkTypeRequirements(ASTNode const& _contract) bool TypeChecker::checkTypeRequirements(ASTNode const& _contract)
{ {
@ -561,13 +584,12 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions."); m_errorReporter.fatalTypeError(var->location(), "Internal or recursive type is not allowed for public or external functions.");
if ( if (
_function.visibility() > FunctionDefinition::Visibility::Internal && _function.visibility() > FunctionDefinition::Visibility::Internal &&
type(*var)->category() == Type::Category::Struct && !_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2) &&
!type(*var)->dataStoredIn(DataLocation::Storage) && !typeSupportedByOldABIEncoder(*type(*var))
!_function.sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::ABIEncoderV2)
) )
m_errorReporter.typeError( m_errorReporter.typeError(
var->location(), var->location(),
"Structs are only supported in the new experimental ABI encoder. " "This type is only supported in the new experimental ABI encoder. "
"Use \"pragma experimental ABIEncoderV2;\" to enable the feature." "Use \"pragma experimental ABIEncoderV2;\" to enable the feature."
); );

2
libsolidity/ast/Types.cpp
View File

@ -1589,8 +1589,6 @@ bool ArrayType::canBeUsedExternally(bool _inLibrary) const
return true; return true;
else if (!m_baseType->canBeUsedExternally(_inLibrary)) else if (!m_baseType->canBeUsedExternally(_inLibrary))
return false; return false;
else if (m_baseType->category() == Category::Array && m_baseType->isDynamicallySized())
return false;
else else
return true; return true;
} }