diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp index a09725b1c..530f5efec 100644 --- a/test/libyul/YulOptimizerTest.cpp +++ b/test/libyul/YulOptimizerTest.cpp @@ -111,7 +111,8 @@ YulOptimizerTest::YulOptimizerTest(string const& _filename): TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted) { - if (!parse(_stream, _linePrefix, _formatted)) + std::tie(m_object, m_analysisInfo) = parse(_stream, _linePrefix, _formatted, m_source); + if (!m_object) return TestResult::FatalError; soltestAssert(m_dialect, "Dialect not set."); @@ -354,26 +355,42 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line return TestResult::FatalError; } - m_obtainedResult = - "step: " + m_optimizerStep + "\n\n" + - (m_object->subObjects.empty() ? AsmPrinter{ *m_dialect }(*m_object->code) : m_object->toString(m_dialect)) + - "\n"; + auto const printed = (m_object->subObjects.empty() ? AsmPrinter{ *m_dialect }(*m_object->code) : m_object->toString(m_dialect)); + + // Re-parse new code for compilability + // TODO: support for wordSizeTransform which needs different input and output dialects + if (m_optimizerStep != "wordSizeTransform" && !std::get<0>(parse(_stream, _linePrefix, _formatted, printed))) + { + util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN}) + << _linePrefix << "Result after the optimiser:" << endl; + printIndented(_stream, printed, _linePrefix + " "); + return TestResult::FatalError; + } + + m_obtainedResult = "step: " + m_optimizerStep + "\n\n" + printed + "\n"; return checkResult(_stream, _linePrefix, _formatted); } -bool YulOptimizerTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted) +std::pair, std::shared_ptr> YulOptimizerTest::parse( + ostream& _stream, + string const& _linePrefix, + bool const _formatted, + string const& _source +) { ErrorList errors; soltestAssert(m_dialect, ""); - std::tie(m_object, m_analysisInfo) = yul::test::parse(m_source, *m_dialect, errors); - if (!m_object || !m_analysisInfo || !Error::containsOnlyWarnings(errors)) + shared_ptr object; + shared_ptr analysisInfo; + std::tie(object, analysisInfo) = yul::test::parse(_source, *m_dialect, errors); + if (!object || !analysisInfo || !Error::containsOnlyWarnings(errors)) { AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl; printErrors(_stream, errors); - return false; + return {}; } - return true; + return {std::move(object), std::move(analysisInfo)}; } void YulOptimizerTest::disambiguate() diff --git a/test/libyul/YulOptimizerTest.h b/test/libyul/YulOptimizerTest.h index 2cebf3057..6baeca728 100644 --- a/test/libyul/YulOptimizerTest.h +++ b/test/libyul/YulOptimizerTest.h @@ -58,7 +58,9 @@ public: TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override; private: - bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted); + std::pair, std::shared_ptr> parse( + std::ostream& _stream, std::string const& _linePrefix, bool const _formatted, std::string const& _source + ); void disambiguate(); void updateContext();