From 3f2027ee5f5aa6ed767f88ec5426e664a254dc8f Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Mon, 5 Sep 2016 17:09:33 +0200 Subject: Separate the try/catch blocks on JSON output generation and formal method output generation. For the reason, see @axic's comment here https://github.com/ethereum/solidity/pull/994#discussion_r77272236 and the following discussion. --- solc/jsonCompiler.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'solc/jsonCompiler.cpp') diff --git a/solc/jsonCompiler.cpp b/solc/jsonCompiler.cpp index 671b8c0f..ef69105e 100644 --- a/solc/jsonCompiler.cpp +++ b/solc/jsonCompiler.cpp @@ -223,7 +223,14 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback contractData["assembly"] = compiler.streamAssembly(unused, contractName, _sources, true); output["contracts"][contractName] = contractData; } + } + catch (...) + { + output["errors"].append("Unknown exception while generating contract data output."); + } + try + { // Do not taint the internal error list ErrorList formalErrors; if (compiler.prepareFormalAnalysis(&formalErrors)) @@ -239,7 +246,14 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback )); output["formal"]["errors"] = errors; } + } + catch (...) + { + output["errors"].append("Unknown exception while generating formal method output."); + } + try + { // Indices into this array are used to abbreviate source names in source locations. output["sourceList"] = Json::Value(Json::arrayValue); for (auto const& source: compiler.sourceNames()) @@ -250,7 +264,7 @@ string compile(StringMap const& _sources, bool _optimize, CStyleReadFileCallback } catch (...) { - output["errors"].append("Unknown exception while generating compiler output."); + output["errors"].append("Unknown exception while generating source name output."); } } -- cgit v1.2.3