diff options
| author | Christian Parpart <christian@ethereum.org> | 2018-07-03 17:51:44 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2018-08-02 20:36:05 +0800 |
| commit | 5d9320c70b11b5ae1a44376451599732aa49dcde (patch) | |
| tree | 6d41279efe62a7f9e62afcb119bdcfb045a3e5ea /libsolidity/analysis | |
| parent | 6003ed2abdea76e809b1e6501b9e5a85b38e5859 (diff) | |
| download | dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar.gz dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar.bz2 dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar.lz dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar.xz dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.tar.zst dexon-solidity-5d9320c70b11b5ae1a44376451599732aa49dcde.zip | |
Disallow loos assembly in Solidity by permanently setting it to SyntaxError (from Warning)
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/ReferencesResolver.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp index a9a998b0..e058d917 100644 --- a/libsolidity/analysis/ReferencesResolver.cpp +++ b/libsolidity/analysis/ReferencesResolver.cpp @@ -277,7 +277,7 @@ 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. assembly::AsmAnalysisInfo analysisInfo; - boost::optional<Error::Type> errorTypeForLoose = m_experimental050Mode ? Error::Type::SyntaxError : Error::Type::Warning; + boost::optional<Error::Type> errorTypeForLoose = Error::Type::SyntaxError; assembly::AsmAnalyzer(analysisInfo, errorsIgnored, EVMVersion(), errorTypeForLoose, assembly::AsmFlavour::Loose, resolver).analyze(_inlineAssembly.operations()); return false; } diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index 8f504ffe..f4354c61 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -927,15 +927,11 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) }; solAssert(!_inlineAssembly.annotation().analysisInfo, ""); _inlineAssembly.annotation().analysisInfo = make_shared<assembly::AsmAnalysisInfo>(); - boost::optional<Error::Type> errorTypeForLoose = - m_scope->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050) ? - Error::Type::SyntaxError : - Error::Type::Warning; assembly::AsmAnalyzer analyzer( *_inlineAssembly.annotation().analysisInfo, m_errorReporter, m_evmVersion, - errorTypeForLoose, + Error::Type::SyntaxError, assembly::AsmFlavour::Loose, identifierAccess ); |