diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp index 457b5294e..57706578c 100644 --- a/libyul/AsmAnalysis.cpp +++ b/libyul/AsmAnalysis.cpp @@ -519,9 +519,9 @@ bool AsmAnalyzer::operator()(Continue const& _continue) return true; } -bool AsmAnalyzer::operator()(Leave const& _leave) +bool AsmAnalyzer::operator()(Leave const& _leaveStatement) { - m_info.stackHeightInfo[&_leave] = m_stackHeight; + m_info.stackHeightInfo[&_leaveStatement] = m_stackHeight; return true; } diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp index 1081206ec..681e93049 100644 --- a/libyul/backends/evm/EVMCodeTransform.cpp +++ b/libyul/backends/evm/EVMCodeTransform.cpp @@ -649,15 +649,15 @@ void CodeTransform::operator()(Continue const& _continue) checkStackHeight(&_continue); } -void CodeTransform::operator()(Leave const& _leave) +void CodeTransform::operator()(Leave const& _leaveStatement) { yulAssert(!m_context->functionExitPoints.empty(), "Invalid leave-statement. Requires surrounding function in code generation."); - m_assembly.setSourceLocation(_leave.location); + m_assembly.setSourceLocation(_leaveStatement.location); Context::JumpInfo const& jump = m_context->functionExitPoints.top(); m_assembly.appendJumpTo(jump.label, appendPopUntil(jump.targetStackHeight)); - checkStackHeight(&_leave); + checkStackHeight(&_leaveStatement); } void CodeTransform::operator()(Block const& _block) diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp index 0d8eb1ae7..0668afb8d 100644 --- a/libyul/optimiser/ASTCopier.cpp +++ b/libyul/optimiser/ASTCopier.cpp @@ -130,9 +130,9 @@ Statement ASTCopier::operator()(Continue const& _continue) return Continue{ _continue }; } -Statement ASTCopier::operator()(Leave const& _leave) +Statement ASTCopier::operator()(Leave const& _leaveStatement) { - return Leave{_leave}; + return Leave{_leaveStatement}; } Statement ASTCopier::operator ()(Block const& _block) diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp index 49aa09018..631697c60 100644 --- a/libyul/optimiser/BlockHasher.cpp +++ b/libyul/optimiser/BlockHasher.cpp @@ -173,10 +173,10 @@ void BlockHasher::operator()(Continue const& _continue) ASTWalker::operator()(_continue); } -void BlockHasher::operator()(Leave const& _leave) +void BlockHasher::operator()(Leave const& _leaveStatement) { hash64(compileTimeLiteralHash("Leave")); - ASTWalker::operator()(_leave); + ASTWalker::operator()(_leaveStatement); } void BlockHasher::operator()(Block const& _block)