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

Use CycleDetector and account for multi-dimensional arrays.

Browse Source
This commit is contained in:
Daniel Kirchner 2018-07-12 20:11:32 +02:00
parent d4dfd28694
commit d71a023c0b
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libsolidity/analysis/TypeChecker.cpp
View File

@ -30,6 +30,7 @@
#include <libsolidity/inlineasm/AsmAnalysisInfo.h> #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/inlineasm/AsmData.h> #include <libsolidity/inlineasm/AsmData.h>
#include <libsolidity/interface/ErrorReporter.h> #include <libsolidity/interface/ErrorReporter.h>
#include <libdevcore/Algorithms.h>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
@ -593,28 +594,24 @@ bool TypeChecker::visit(StructDefinition const& _struct)
m_errorReporter.typeError(member->location(), "Type cannot be used in struct."); m_errorReporter.typeError(member->location(), "Type cannot be used in struct.");
// Check recursion, fatal error if detected. // Check recursion, fatal error if detected.
using StructPointer = StructDefinition const*; auto visitor = [&](StructDefinition const& _struct, CycleDetector<StructDefinition>& _cycleDetector)
using StructPointersSet = set<StructPointer>;
function<void(StructPointer,StructPointersSet const&)> check = [&](StructPointer _struct, StructPointersSet const& _parents)
{ {
if (_parents.count(_struct)) for (ASTPointer<VariableDeclaration> const& member: _struct.members())
m_errorReporter.fatalTypeError(_struct->location(), "Recursive struct definition."); {
StructPointersSet parents = _parents; Type const* memberType = type(*member).get();
parents.insert(_struct); while (auto arrayType = dynamic_cast<ArrayType const*>(memberType))
for (ASTPointer<VariableDeclaration> const& member: _struct->members())
if (type(*member)->category() == Type::Category::Struct)
{ {
auto const& typeName = dynamic_cast<UserDefinedTypeName const&>(*member->typeName()); if (arrayType->isDynamicallySized())
check(&dynamic_cast<StructDefinition const&>(*typeName.annotation().referencedDeclaration), parents); break;
} memberType = arrayType->baseType().get();
else if (auto arrayType = dynamic_cast<ArrayType const*>(type(*member).get()))
{
if (!arrayType->isDynamicallySized())
if (auto structType = dynamic_cast<StructType const*>(arrayType->baseType().get()))
check(&structType->structDefinition(), parents);
} }
if (auto structType = dynamic_cast<StructType const*>(memberType))
if (_cycleDetector.run(structType->structDefinition()))
return;
}
}; };
check(&_struct, StructPointersSet{}); if (CycleDetector<StructDefinition>(visitor).run(_struct) != nullptr)
m_errorReporter.fatalTypeError(_struct.location(), "Recursive struct definition.");
ASTNode::listAccept(_struct.members(), *this); ASTNode::listAccept(_struct.members(), *this);