cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5592 from ethereum/fix-issue-5446

Browse Source 
Relax assertion about jumps in loose mode
This commit is contained in:
chriseth 2018-12-05 11:43:31 +01:00 committed by GitHub
commit dd6327594f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libyul/AsmAnalysis.cpp
View File

@ -629,7 +629,9 @@ void AsmAnalyzer::warnOnInstructions(solidity::Instruction _instr, SourceLocatio
if (_instr == solidity::Instruction::JUMP || _instr == solidity::Instruction::JUMPI || _instr == solidity::Instruction::JUMPDEST) if (_instr == solidity::Instruction::JUMP || _instr == solidity::Instruction::JUMPI || _instr == solidity::Instruction::JUMPDEST)
{ {
solAssert(m_dialect.flavour == AsmFlavour::Loose, ""); if (m_dialect.flavour != AsmFlavour::Loose)
solAssert(m_errorTypeForLoose && *m_errorTypeForLoose != Error::Type::Warning, "");
m_errorReporter.error( m_errorReporter.error(
m_errorTypeForLoose ? *m_errorTypeForLoose : Error::Type::Warning, m_errorTypeForLoose ? *m_errorTypeForLoose : Error::Type::Warning,
_location, _location,

2
test/tools/yulopti.cpp
View File

@ -94,7 +94,7 @@ public:
*m_analysisInfo, *m_analysisInfo,
errorReporter, errorReporter,
EVMVersion::byzantium(), EVMVersion::byzantium(),
boost::none, langutil::Error::Type::SyntaxError,
Dialect::strictAssemblyForEVM() Dialect::strictAssemblyForEVM()
); );
if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty()) if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())