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

fixed mistake because of conflict resolving

Browse Source
This commit is contained in:
Liana Husikyan
2015-06-01 13:06:12 +02:00
parent 2f50eb0028
commit 0f323b1ef4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ExpressionCompiler.cpp
+5 -4
View File
@@ -1102,10 +1102,11 @@ void ExpressionCompiler::appendExternalFunctionCall(
)
m_context << eth::Instruction::CALLCODE;
else
{
m_context << eth::Instruction::CALL << eth::Instruction::ISZERO;
auto tag = m_context.appendConditionalJumpTo(m_context.errorTag());// if CALL leaves 0.
}
m_context << eth::Instruction::CALL;
m_context << eth::Instruction::ISZERO;
auto tag = m_context.appendConditionalJumpTo(m_context.errorTag());// if CALL leaves 0.
if (_functionType.valueSet())
m_context << eth::Instruction::POP;
if (_functionType.gasSet())