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

Fixes segfault on empty contract w/ error recovery.

Browse Source
This commit is contained in:
Erik Kundt 2019-12-11 12:46:47 +01:00
parent 0620936506
commit cc1b28b12e
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
libsolidity/interface/CompilerStack.cpp
View File

@ -281,42 +281,43 @@ bool CompilerStack::analyze()
{ {
SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser); SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!syntaxChecker.checkSyntax(*source->ast)) if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
noErrors = false; noErrors = false;
DocStringAnalyser docStringAnalyser(m_errorReporter); DocStringAnalyser docStringAnalyser(m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!docStringAnalyser.analyseDocStrings(*source->ast)) if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
noErrors = false; noErrors = false;
m_globalContext = make_shared<GlobalContext>(); m_globalContext = make_shared<GlobalContext>();
NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_scopes, m_errorReporter); NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_scopes, m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!resolver.registerDeclarations(*source->ast)) if (source->ast && !resolver.registerDeclarations(*source->ast))
return false; return false;
map<string, SourceUnit const*> sourceUnitsByName; map<string, SourceUnit const*> sourceUnitsByName;
for (auto& source: m_sources) for (auto& source: m_sources)
sourceUnitsByName[source.first] = source.second.ast.get(); sourceUnitsByName[source.first] = source.second.ast.get();
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!resolver.performImports(*source->ast, sourceUnitsByName)) if (source->ast && !resolver.performImports(*source->ast, sourceUnitsByName))
return false; return false;
// This is the main name and type resolution loop. Needs to be run for every contract, because // This is the main name and type resolution loop. Needs to be run for every contract, because
// the special variables "this" and "super" must be set appropriately. // the special variables "this" and "super" must be set appropriately.
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
for (ASTPointer<ASTNode> const& node: source->ast->nodes()) if (source->ast)
{ for (ASTPointer<ASTNode> const& node: source->ast->nodes())
if (!resolver.resolveNamesAndTypes(*node)) {
return false; if (!resolver.resolveNamesAndTypes(*node))
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) return false;
// Note that we now reference contracts by their fully qualified names, and if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
// thus contracts can only conflict if declared in the same source file. This // Note that we now reference contracts by their fully qualified names, and
// already causes a double-declaration error elsewhere, so we do not report // thus contracts can only conflict if declared in the same source file. This
// an error here and instead silently drop any additional contracts we find. // already causes a double-declaration error elsewhere, so we do not report
if (m_contracts.find(contract->fullyQualifiedName()) == m_contracts.end()) // an error here and instead silently drop any additional contracts we find.
m_contracts[contract->fullyQualifiedName()].contract = contract; if (m_contracts.find(contract->fullyQualifiedName()) == m_contracts.end())
} m_contracts[contract->fullyQualifiedName()].contract = contract;
}
// Next, we check inheritance, overrides, function collisions and other things at // Next, we check inheritance, overrides, function collisions and other things at
// contract or function level. // contract or function level.
@ -324,10 +325,11 @@ bool CompilerStack::analyze()
// type checker. // type checker.
ContractLevelChecker contractLevelChecker(m_errorReporter); ContractLevelChecker contractLevelChecker(m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
for (ASTPointer<ASTNode> const& node: source->ast->nodes()) if (source->ast)
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) for (ASTPointer<ASTNode> const& node: source->ast->nodes())
if (!contractLevelChecker.check(*contract)) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
noErrors = false; if (!contractLevelChecker.check(*contract))
noErrors = false;
// New we run full type checks that go down to the expression level. This // New we run full type checks that go down to the expression level. This
// cannot be done earlier, because we need cross-contract types and information // cannot be done earlier, because we need cross-contract types and information
@ -338,17 +340,18 @@ bool CompilerStack::analyze()
// which is only done one step later. // which is only done one step later.
TypeChecker typeChecker(m_evmVersion, m_errorReporter); TypeChecker typeChecker(m_evmVersion, m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
for (ASTPointer<ASTNode> const& node: source->ast->nodes()) if (source->ast)
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get())) for (ASTPointer<ASTNode> const& node: source->ast->nodes())
if (!typeChecker.checkTypeRequirements(*contract)) if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
noErrors = false; if (!typeChecker.checkTypeRequirements(*contract))
noErrors = false;
if (noErrors) if (noErrors)
{ {
// Checks that can only be done when all types of all AST nodes are known. // Checks that can only be done when all types of all AST nodes are known.
PostTypeChecker postTypeChecker(m_errorReporter); PostTypeChecker postTypeChecker(m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!postTypeChecker.check(*source->ast)) if (source->ast && !postTypeChecker.check(*source->ast))
noErrors = false; noErrors = false;
} }
@ -358,14 +361,14 @@ bool CompilerStack::analyze()
// variable is used before it is assigned to. // variable is used before it is assigned to.
CFG cfg(m_errorReporter); CFG cfg(m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!cfg.constructFlow(*source->ast)) if (source->ast && !cfg.constructFlow(*source->ast))
noErrors = false; noErrors = false;
if (noErrors) if (noErrors)
{ {
ControlFlowAnalyzer controlFlowAnalyzer(cfg, m_errorReporter); ControlFlowAnalyzer controlFlowAnalyzer(cfg, m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!controlFlowAnalyzer.analyze(*source->ast)) if (source->ast && !controlFlowAnalyzer.analyze(*source->ast))
noErrors = false; noErrors = false;
} }
} }
@ -375,7 +378,7 @@ bool CompilerStack::analyze()
// Checks for common mistakes. Only generates warnings. // Checks for common mistakes. Only generates warnings.
StaticAnalyzer staticAnalyzer(m_errorReporter); StaticAnalyzer staticAnalyzer(m_errorReporter);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
if (!staticAnalyzer.analyze(*source->ast)) if (source->ast && !staticAnalyzer.analyze(*source->ast))
noErrors = false; noErrors = false;
} }
@ -384,7 +387,8 @@ bool CompilerStack::analyze()
// Check for state mutability in every function. // Check for state mutability in every function.
vector<ASTPointer<ASTNode>> ast; vector<ASTPointer<ASTNode>> ast;
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
ast.push_back(source->ast); if (source->ast)
ast.push_back(source->ast);
if (!ViewPureChecker(ast, m_errorReporter).check()) if (!ViewPureChecker(ast, m_errorReporter).check())
noErrors = false; noErrors = false;
@ -394,7 +398,8 @@ bool CompilerStack::analyze()
{ {
ModelChecker modelChecker(m_errorReporter, m_smtlib2Responses, m_readFile, m_enabledSMTSolvers); ModelChecker modelChecker(m_errorReporter, m_smtlib2Responses, m_readFile, m_enabledSMTSolvers);
for (Source const* source: m_sourceOrder) for (Source const* source: m_sourceOrder)
modelChecker.analyze(*source->ast); if (source->ast)
modelChecker.analyze(*source->ast);
m_unhandledSMTLib2Queries += modelChecker.unhandledQueries(); m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
} }
} }