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 boost::current_exception_diagnostic_information() to print extra info about exceptions caught by (...)

Browse Source
This commit is contained in:
Kamil Śliwak 2021-10-07 17:40:57 +02:00
parent daf61a4c90
commit a30348715b
7 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/interface/FileReader.cpp
View File

@ -171,7 +171,7 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
} }
catch (...) catch (...)
{ {
return ReadCallback::Result{false, "Unknown exception in read callback."}; return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
} }
} }

8
libsolidity/interface/StandardCompiler.cpp
View File

@ -1151,13 +1151,13 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
"Exception during compilation: " + boost::diagnostic_information(_exception) "Exception during compilation: " + boost::diagnostic_information(_exception)
)); ));
} }
catch (std::exception const& _e) catch (std::exception const& _exception)
{ {
errors.append(formatError( errors.append(formatError(
Error::Severity::Error, Error::Severity::Error,
"Exception", "Exception",
"general", "general",
"Unknown exception during compilation" + (_e.what() ? ": " + string(_e.what()) : ".") "Unknown exception during compilation: " + boost::diagnostic_information(_exception)
)); ));
} }
catch (...) catch (...)
@ -1166,7 +1166,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
Error::Severity::Error, Error::Severity::Error,
"Exception", "Exception",
"general", "general",
"Unknown exception during compilation." "Unknown exception during compilation: " + boost::current_exception_diagnostic_information()
)); ));
} }
@ -1481,7 +1481,7 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
} }
catch (...) catch (...)
{ {
return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compile"); return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compile: " + boost::current_exception_diagnostic_information());
} }
} }

4
test/boostTest.cpp
View File

@ -87,6 +87,10 @@ void runTestCase(TestCase::Config const& _config, TestCase::TestCaseCreator cons
{ {
BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e)); BOOST_ERROR("Exception during extracted test: " << boost::diagnostic_information(_e));
} }
catch (...)
{
BOOST_ERROR("Unknown exception during extracted test: " << boost::current_exception_diagnostic_information());
}
} }
int registerTests( int registerTests(

9
test/libsolidity/SolidityExpressionCompiler.cpp
View File

@ -112,9 +112,14 @@ bytes compileFirstExpression(
if (!sourceUnit) if (!sourceUnit)
return bytes(); return bytes();
} }
catch(boost::exception const& _e) catch (boost::exception const& _e)
{ {
auto msg = std::string("Parsing source code failed with: \n") + boost::diagnostic_information(_e); string msg = "Parsing source code failed with:\n" + boost::diagnostic_information(_e);
BOOST_FAIL(msg);
}
catch (...)
{
string msg = "Parsing source code failed with:\n" + boost::current_exception_diagnostic_information();
BOOST_FAIL(msg); BOOST_FAIL(msg);
} }

6
test/tools/isoltest.cpp
View File

@ -201,15 +201,13 @@ TestTool::Result TestTool::process()
catch (std::exception const& _e) catch (std::exception const& _e)
{ {
AnsiColorized(cout, formatted, {BOLD, RED}) << AnsiColorized(cout, formatted, {BOLD, RED}) <<
"Exception during test" << "Exception during test: " << boost::diagnostic_information(_e) << endl;
(_e.what() ? ": " + string(_e.what()) : ".") <<
endl;
return Result::Exception; return Result::Exception;
} }
catch (...) catch (...)
{ {
AnsiColorized(cout, formatted, {BOLD, RED}) << AnsiColorized(cout, formatted, {BOLD, RED}) <<
"Unknown exception during test." << endl; "Unknown exception during test: " << boost::current_exception_diagnostic_information() << endl;
return Result::Exception; return Result::Exception;
} }
} }

8
tools/solidityUpgrade/SourceUpgrade.cpp
View File

@ -306,13 +306,13 @@ void SourceUpgrade::tryCompile() const
{ {
error() << "Exception during compilation: " << boost::diagnostic_information(_exception) << endl; error() << "Exception during compilation: " << boost::diagnostic_information(_exception) << endl;
} }
catch (std::exception const& _e) catch (std::exception const& _exception)
{ {
error() << (_e.what() ? ": " + string(_e.what()) : ".") << endl; error() << "Exception during compilation: " << boost::diagnostic_information(_exception) << endl;
} }
catch (...) catch (...)
{ {
error() << "Unknown exception during compilation." << endl; error() << "Unknown exception during compilation: " << boost::current_exception_diagnostic_information() << endl;
} }
} }
@ -517,7 +517,7 @@ ReadCallback::Callback SourceUpgrade::fileReader()
} }
catch (...) catch (...)
{ {
return ReadCallback::Result{false, "Unknown exception in read callback."}; return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
} }
}; };

4
tools/solidityUpgrade/main.cpp
View File

@ -86,6 +86,10 @@ int main(int argc, char** argv)
{ {
cerr << "Exception while processing input: " << boost::diagnostic_information(_exception) << endl; cerr << "Exception while processing input: " << boost::diagnostic_information(_exception) << endl;
} }
catch (...)
{
cerr << "Unknown exception while processing input: " << boost::current_exception_diagnostic_information() << endl;
}
return 0; return 0;
} }