diff options
| author | chriseth <chris@ethereum.org> | 2017-10-04 23:01:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-04 23:01:52 +0800 |
| commit | 19274c78904632d568bf56e95603d22ef091ce77 (patch) | |
| tree | 4732d306390f1445a413d8163a5bb69c3565d7ca /libsolidity/codegen | |
| parent | 66b188cce9a7f17c51b7a58c1296d574ad34fa61 (diff) | |
| parent | a5fddc9c57c8d23b3b2c335fa754df9007953039 (diff) | |
| download | dexon-solidity-19274c78904632d568bf56e95603d22ef091ce77.tar.gz dexon-solidity-19274c78904632d568bf56e95603d22ef091ce77.tar.zst dexon-solidity-19274c78904632d568bf56e95603d22ef091ce77.zip | |
Merge pull request #2962 from ethereum/optionalDebugInfoAsm
Debugging info in CompilerContext.
Diffstat (limited to 'libsolidity/codegen')
| -rw-r--r-- | libsolidity/codegen/CompilerContext.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index d87c7be5..ce9c3b7f 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -38,6 +38,13 @@ #include <utility> #include <numeric> +// Change to "define" to output all intermediate code +#undef SOL_OUTPUT_ASM +#ifdef SOL_OUTPUT_ASM +#include <libsolidity/inlineasm/AsmPrinter.h> +#endif + + using namespace std; namespace dev @@ -313,10 +320,17 @@ void CompilerContext::appendInlineAssembly( ErrorReporter errorReporter(errors); auto scanner = make_shared<Scanner>(CharStream(_assembly), "--CODEGEN--"); auto parserResult = assembly::Parser(errorReporter).parse(scanner); - if (!parserResult || !errorReporter.errors().empty()) +#ifdef SOL_OUTPUT_ASM + cout << assembly::AsmPrinter()(*parserResult) << endl; +#endif + assembly::AsmAnalysisInfo analysisInfo; + bool analyzerResult = false; + if (parserResult) + analyzerResult = assembly::AsmAnalyzer(analysisInfo, errorReporter, false, identifierAccess.resolve).analyze(*parserResult); + if (!parserResult || !errorReporter.errors().empty() || !analyzerResult) { string message = - "Error parsing inline assembly block:\n" + "Error parsing/analyzing inline assembly block:\n" "------------------ Input: -----------------\n" + _assembly + "\n" "------------------ Errors: ----------------\n"; @@ -331,9 +345,6 @@ void CompilerContext::appendInlineAssembly( solAssert(false, message); } - assembly::AsmAnalysisInfo analysisInfo; - assembly::AsmAnalyzer analyzer(analysisInfo, errorReporter, false, identifierAccess.resolve); - solAssert(analyzer.analyze(*parserResult), "Failed to analyze inline assembly block."); solAssert(errorReporter.errors().empty(), "Failed to analyze inline assembly block."); assembly::CodeGenerator::assemble(*parserResult, analysisInfo, *m_asm, identifierAccess, _system); } |