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

Enable struct encoding.

Browse Source
This commit is contained in:
chriseth 2019-01-24 13:52:06 +01:00
parent a08f4f43fa
commit 0c2d623ee4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libsolidity/ast/Types.cpp
View File

@ -415,7 +415,7 @@ MemberList const& Type::members(ContractDefinition const* _currentScope) const
return *m_members[_currentScope]; return *m_members[_currentScope];
} }
TypePointer Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool _packed) const TypePointer Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool) const
{ {
TypePointer encodingType = mobileType(); TypePointer encodingType = mobileType();
if (encodingType) if (encodingType)
@ -423,7 +423,7 @@ TypePointer Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool _p
if (encodingType) if (encodingType)
encodingType = encodingType->encodingType(); encodingType = encodingType->encodingType();
// Structs are fine in the following circumstances: // Structs are fine in the following circumstances:
// - ABIv2 without packed encoding or, // - ABIv2 or,
// - storage struct for a library // - storage struct for a library
if (_inLibraryCall && encodingType->dataStoredIn(DataLocation::Storage)) if (_inLibraryCall && encodingType->dataStoredIn(DataLocation::Storage))
return encodingType; return encodingType;
@ -431,7 +431,7 @@ TypePointer Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool _p
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();
if (dynamic_cast<StructType const*>(baseType.get())) if (dynamic_cast<StructType const*>(baseType.get()))
if (!_encoderV2 || _packed) if (!_encoderV2)
return TypePointer(); return TypePointer();
return encodingType; return encodingType;
} }