From 3c1d12b16c5cce7a7e8326fdabd051aba02ccfb9 Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Tue, 10 Sep 2019 12:11:04 +0200 Subject: [PATCH] Assembly: Remove errorTypeForLoose property from AsmAnalyzer. --- libsolidity/analysis/ReferencesResolver.cpp | 2 -- libsolidity/analysis/TypeChecker.cpp | 1 - libsolidity/codegen/CompilerContext.cpp | 1 - libyul/AsmAnalysis.cpp | 1 - libyul/AsmAnalysis.h | 3 --- libyul/AssemblyStack.cpp | 1 - libyul/backends/wasm/EVMToEWasmTranslator.cpp | 2 +- test/libyul/Parser.cpp | 1 - test/tools/yulopti.cpp | 1 - 9 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp index 937d1f4da..98cd15148 100644 --- a/libsolidity/analysis/ReferencesResolver.cpp +++ b/libsolidity/analysis/ReferencesResolver.cpp @@ -323,11 +323,9 @@ bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly) // Will be re-generated later with correct information // We use the latest EVM version because we will re-run it anyway. yul::AsmAnalysisInfo analysisInfo; - boost::optional errorTypeForLoose = Error::Type::SyntaxError; yul::AsmAnalyzer( analysisInfo, errorsIgnored, - errorTypeForLoose, yul::EVMDialect::strictAssemblyForEVM(EVMVersion{}), resolver ).analyze(_inlineAssembly.operations()); diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 0b31fbf95..49efe020d 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -725,7 +725,6 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) yul::AsmAnalyzer analyzer( *_inlineAssembly.annotation().analysisInfo, m_errorReporter, - Error::Type::SyntaxError, _inlineAssembly.dialect(), identifierAccess ); diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp index da947073f..6a23d25cc 100644 --- a/libsolidity/codegen/CompilerContext.cpp +++ b/libsolidity/codegen/CompilerContext.cpp @@ -411,7 +411,6 @@ void CompilerContext::appendInlineAssembly( analyzerResult = yul::AsmAnalyzer( analysisInfo, errorReporter, - boost::none, dialect, identifierAccess.resolve ).analyze(*parserResult); diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp index b2858d457..7574ea506 100644 --- a/libyul/AsmAnalysis.cpp +++ b/libyul/AsmAnalysis.cpp @@ -78,7 +78,6 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect, bool success = yul::AsmAnalyzer( analysisInfo, errors, - Error::Type::SyntaxError, _dialect, {}, _object.dataNames() diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h index 43afe8bc2..0f6eeff35 100644 --- a/libyul/AsmAnalysis.h +++ b/libyul/AsmAnalysis.h @@ -59,7 +59,6 @@ public: explicit AsmAnalyzer( AsmAnalysisInfo& _analysisInfo, langutil::ErrorReporter& _errorReporter, - boost::optional _errorTypeForLoose, Dialect const& _dialect, ExternalIdentifierAccess::Resolver const& _resolver = ExternalIdentifierAccess::Resolver(), std::set const& _dataNames = {} @@ -68,7 +67,6 @@ public: m_info(_analysisInfo), m_errorReporter(_errorReporter), m_dialect(_dialect), - m_errorTypeForLoose(_errorTypeForLoose), m_dataNames(_dataNames) { if (EVMDialect const* evmDialect = dynamic_cast(&m_dialect)) @@ -120,7 +118,6 @@ private: langutil::ErrorReporter& m_errorReporter; langutil::EVMVersion m_evmVersion; Dialect const& m_dialect; - boost::optional m_errorTypeForLoose; /// Names of data objects to be referenced by builtin functions with literal arguments. std::set m_dataNames; ForLoop const* m_currentForLoop = nullptr; diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp index 622eaa728..e411a87e4 100644 --- a/libyul/AssemblyStack.cpp +++ b/libyul/AssemblyStack.cpp @@ -117,7 +117,6 @@ bool AssemblyStack::analyzeParsed(Object& _object) AsmAnalyzer analyzer( *_object.analysisInfo, m_errorReporter, - boost::none, languageToDialect(m_language, m_evmVersion), {}, _object.dataNames() diff --git a/libyul/backends/wasm/EVMToEWasmTranslator.cpp b/libyul/backends/wasm/EVMToEWasmTranslator.cpp index 1be9a1a38..80ea73b02 100644 --- a/libyul/backends/wasm/EVMToEWasmTranslator.cpp +++ b/libyul/backends/wasm/EVMToEWasmTranslator.cpp @@ -658,7 +658,7 @@ Object EVMToEWasmTranslator::run(Object const& _object) ErrorList errors; ErrorReporter errorReporter(errors); - AsmAnalyzer analyzer(*ret.analysisInfo, errorReporter, boost::none, WasmDialect::instance(), {}, _object.dataNames()); + AsmAnalyzer analyzer(*ret.analysisInfo, errorReporter, WasmDialect::instance(), {}, _object.dataNames()); if (!analyzer.analyze(*ret.code)) { // TODO the errors here are "wrong" because they have invalid source references! diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp index 575329abe..09fe8effd 100644 --- a/test/libyul/Parser.cpp +++ b/test/libyul/Parser.cpp @@ -61,7 +61,6 @@ bool parse(string const& _source, Dialect const& _dialect, ErrorReporter& errorR return (yul::AsmAnalyzer( analysisInfo, errorReporter, - boost::none, _dialect )).analyze(*parserResult); } diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp index 7d0b1d952..d4820a59a 100644 --- a/test/tools/yulopti.cpp +++ b/test/tools/yulopti.cpp @@ -106,7 +106,6 @@ public: AsmAnalyzer analyzer( *m_analysisInfo, errorReporter, - langutil::Error::Type::SyntaxError, m_dialect ); if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())