cerc-io/solidity
16
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

Assembly: Remove some explicit checks for Loose Assembly

Browse Source
This commit is contained in:
Christian Parpart 2019-09-10 11:58:20 +02:00
parent d659dbd49c
commit 3df5dbbca4
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libyul/AsmAnalysis.cpp
View File

@ -203,18 +203,16 @@ bool AsmAnalyzer::operator()(ExpressionStatement const& _statement)
{ {
int initialStackHeight = m_stackHeight; int initialStackHeight = m_stackHeight;
bool success = boost::apply_visitor(*this, _statement.expression); bool success = boost::apply_visitor(*this, _statement.expression);
if (m_stackHeight != initialStackHeight && (m_dialect.flavour != AsmFlavour::Loose || m_errorTypeForLoose)) if (m_stackHeight != initialStackHeight)
{ {
Error::Type errorType = m_dialect.flavour == AsmFlavour::Loose ? *m_errorTypeForLoose : Error::Type::TypeError;
string msg = string msg =
"Top-level expressions are not supposed to return values (this expression returns " + "Top-level expressions are not supposed to return values (this expression returns " +
to_string(m_stackHeight - initialStackHeight) + to_string(m_stackHeight - initialStackHeight) +
" value" + " value" +
(m_stackHeight - initialStackHeight == 1 ? "" : "s") + (m_stackHeight - initialStackHeight == 1 ? "" : "s") +
"). Use ``pop()`` or assign them."; "). Use ``pop()`` or assign them.";
m_errorReporter.error(errorType, _statement.location, msg); m_errorReporter.error(Error::Type::TypeError, _statement.location, msg);
if (errorType != Error::Type::Warning) success = false;
success = false;
} }
m_info.stackHeightInfo[&_statement] = m_stackHeight; m_info.stackHeightInfo[&_statement] = m_stackHeight;
return success; return success;
@ -723,22 +721,13 @@ void AsmAnalyzer::warnOnInstructions(dev::eth::Instruction _instr, SourceLocatio
_instr == dev::eth::Instruction::JUMPDEST _instr == dev::eth::Instruction::JUMPDEST
) )
{ {
if (m_dialect.flavour == AsmFlavour::Loose) m_errorReporter.error(
m_errorReporter.error( Error::Type::SyntaxError,
m_errorTypeForLoose ? *m_errorTypeForLoose : Error::Type::Warning, _location,
_location, "Jump instructions and labels are low-level EVM features that can lead to "
"Jump instructions and labels are low-level EVM features that can lead to " "incorrect stack access. Because of that they are disallowed in strict assembly. "
"incorrect stack access. Because of that they are discouraged. " "Use functions, \"switch\", \"if\" or \"for\" statements instead."
"Please consider using \"switch\", \"if\" or \"for\" statements instead." );
);
else
m_errorReporter.error(
Error::Type::SyntaxError,
_location,
"Jump instructions and labels are low-level EVM features that can lead to "
"incorrect stack access. Because of that they are disallowed in strict assembly. "
"Use functions, \"switch\", \"if\" or \"for\" statements instead."
);
} }
} }