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

Merge pull request #7643 from ethereum/fixWindows67

Browse Source 
Fix windows build
This commit is contained in:
Alex Beregszaszi 2019-11-06 10:19:21 +00:00 committed by GitHub
commit f693262b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libyul/AsmAnalysis.cpp
View File

@ -519,9 +519,9 @@ bool AsmAnalyzer::operator()(Continue const& _continue)
return true; 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; return true;
} }

6
libyul/backends/evm/EVMCodeTransform.cpp
View File

@ -649,15 +649,15 @@ void CodeTransform::operator()(Continue const& _continue)
checkStackHeight(&_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."); 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(); Context::JumpInfo const& jump = m_context->functionExitPoints.top();
m_assembly.appendJumpTo(jump.label, appendPopUntil(jump.targetStackHeight)); m_assembly.appendJumpTo(jump.label, appendPopUntil(jump.targetStackHeight));
checkStackHeight(&_leave); checkStackHeight(&_leaveStatement);
} }
void CodeTransform::operator()(Block const& _block) void CodeTransform::operator()(Block const& _block)

4
libyul/optimiser/ASTCopier.cpp
View File

@ -130,9 +130,9 @@ Statement ASTCopier::operator()(Continue const& _continue)
return Continue{ _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) Statement ASTCopier::operator ()(Block const& _block)

4
libyul/optimiser/BlockHasher.cpp
View File

@ -173,10 +173,10 @@ void BlockHasher::operator()(Continue const& _continue)
ASTWalker::operator()(_continue); ASTWalker::operator()(_continue);
} }
void BlockHasher::operator()(Leave const& _leave) void BlockHasher::operator()(Leave const& _leaveStatement)
{ {
hash64(compileTimeLiteralHash("Leave")); hash64(compileTimeLiteralHash("Leave"));
ASTWalker::operator()(_leave); ASTWalker::operator()(_leaveStatement);
} }
void BlockHasher::operator()(Block const& _block) void BlockHasher::operator()(Block const& _block)