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

Catch assembler exceptions and throw readable Solidity exceptions

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-04-27 14:36:38 +01:00
parent 122dc65b36
commit 16276ab10b
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libsolidity/interface/CompilerStack.cpp
View File

@ -657,8 +657,41 @@ void CompilerStack::compileContract(
cborEncodedMetadata += toCompactBigEndian(cborEncodedMetadata.size(), 2);
compiler->compileContract(_contract, _compiledContracts, cborEncodedMetadata);
compiledContract.compiler = compiler;
compiledContract.object = compiler->assembledObject();
compiledContract.runtimeObject = compiler->runtimeObject();
try
{
compiledContract.object = compiler->assembledObject();
}
catch(eth::OptimizerException const&)
{
auto err = make_shared<Error>(Error::Type::InternalCompilerError);
*err << errinfo_comment("Assembly optimizer exception for bytecode");
m_errors.push_back(std::move(err);
}
catch(eth::AssemblyException const&)
{
auto err = make_shared<Error>(Error::Type::InternalCompilerError);
*err << errinfo_comment("Assembly exception for bytecode");
m_errors.push_back(std::move(err);
}
try
{
compiledContract.runtimeObject = compiler->runtimeObject();
}
catch(eth::OptimizerException const&)
{
auto err = make_shared<Error>(Error::Type::InternalCompilerError);
*err << errinfo_comment("Assembly optimizer exception for deployed bytecode");
m_errors.push_back(std::move(err);
}
catch(eth::AssemblyException const&)
{
auto err = make_shared<Error>(Error::Type::InternalCompilerError);
*err << errinfo_comment("Assembly exception for deployed bytecode");
m_errors.push_back(std::move(err);
}
compiledContract.onChainMetadata = onChainMetadata;
_compiledContracts[compiledContract.contract] = &compiler->assembly();