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

Do not catch InternalCompilerErrors as part of fatal error handling.

Browse Source 
InternalCompilerErrors always have to end the whole compilation process because a serious inconsistency was detected.
This commit is contained in:
chriseth 2015-10-16 14:52:01 +02:00
parent 52eaa477d4
commit 7b56206a98
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/CompilerStack.cpp
View File

@ -104,7 +104,9 @@ bool CompilerStack::parse()
for (auto& sourcePair: m_sources) for (auto& sourcePair: m_sources)
{ {
sourcePair.second.scanner->reset(); sourcePair.second.scanner->reset();
sourcePair.second.ast = Parser(m_errors).parse(sourcePair.second.scanner); // todo check for errors sourcePair.second.ast = Parser(m_errors).parse(sourcePair.second.scanner);
if (!sourcePair.second.ast)
solAssert(!Error::containsOnlyWarnings(m_errors), "Parser returned null but did not report error.");
} }
if (!Error::containsOnlyWarnings(m_errors)) if (!Error::containsOnlyWarnings(m_errors))
// errors while parsing. sould stop before type checking // errors while parsing. sould stop before type checking

10
libsolidity/NameAndTypeResolver.cpp
View File

@ -49,8 +49,10 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit)
{ {
DeclarationRegistrationHelper registrar(m_scopes, _sourceUnit, m_errors); DeclarationRegistrationHelper registrar(m_scopes, _sourceUnit, m_errors);
} }
catch (FatalError) catch (FatalError const& _e)
{ {
if (m_errors.empty())
throw; // Something is weird here, rather throw again.
return false; return false;
} }
return true; return true;
@ -124,6 +126,8 @@ bool NameAndTypeResolver::resolveNamesAndTypes(ContractDefinition& _contract)
} }
catch (FatalError const& _e) catch (FatalError const& _e)
{ {
if (m_errors.empty())
throw; // Something is weird here, rather throw again.
return false; return false;
} }
return true; return true;
@ -136,8 +140,10 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
m_scopes[nullptr].registerDeclaration(_declaration, false, true); m_scopes[nullptr].registerDeclaration(_declaration, false, true);
solAssert(_declaration.scope() == nullptr, "Updated declaration outside global scope."); solAssert(_declaration.scope() == nullptr, "Updated declaration outside global scope.");
} }
catch(FatalError const& _error) catch (FatalError const& _error)
{ {
if (m_errors.empty())
throw; // Something is weird here, rather throw again.
return false; return false;
} }
return true; return true;

8
libsolidity/Parser.cpp
View File

@ -88,12 +88,10 @@ ASTPointer<SourceUnit> Parser::parse(shared_ptr<Scanner> const& _scanner)
} }
return nodeFactory.createNode<SourceUnit>(nodes); return nodeFactory.createNode<SourceUnit>(nodes);
} }
catch(FatalError const& _error) catch (FatalError const& _error)
{
return nullptr;
}
catch(Exception const& _e)
{ {
if (m_errors.empty())
throw; // Something is weird here, rather throw again.
return nullptr; return nullptr;
} }
} }

2
libsolidity/TypeChecker.cpp
View File

@ -43,7 +43,7 @@ bool TypeChecker::checkTypeRequirements(const ContractDefinition& _contract)
if (m_errors.empty()) if (m_errors.empty())
throw; // Something is weird here, rather throw again. throw; // Something is weird here, rather throw again.
} }
return Error::containsOnlyWarnings(m_errors); return Error::containsOnlyWarnings(m_errors);
} }
TypePointer const& TypeChecker::type(Expression const& _expression) const TypePointer const& TypeChecker::type(Expression const& _expression) const