diff options
| author | Liana Husikyan <liana@ethdev.com> | 2015-05-19 18:58:12 +0800 |
|---|---|---|
| committer | Liana Husikyan <liana@ethdev.com> | 2015-06-01 19:06:12 +0800 |
| commit | 0f323b1ef476078efafc8be27e03667750a6cd4f (patch) | |
| tree | 21c38330f9310d25ec057affb44663266e7c64cf /ExpressionCompiler.cpp | |
| parent | 2f50eb0028c7f7525ff35a60db7a18e09eee42e6 (diff) | |
| download | dexon-solidity-0f323b1ef476078efafc8be27e03667750a6cd4f.tar.gz dexon-solidity-0f323b1ef476078efafc8be27e03667750a6cd4f.tar.zst dexon-solidity-0f323b1ef476078efafc8be27e03667750a6cd4f.zip | |
fixed mistake because of conflict resolving
Diffstat (limited to 'ExpressionCompiler.cpp')
| -rw-r--r-- | ExpressionCompiler.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ExpressionCompiler.cpp b/ExpressionCompiler.cpp index a9f0ba3e..063af7ce 100644 --- a/ExpressionCompiler.cpp +++ b/ExpressionCompiler.cpp @@ -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()) |