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

Merge pull request #1975 from LianaHus/sol_EVMExceptions

Browse Source 
"error jump" instead of STOP instraction in case of exception
This commit is contained in:
chriseth
2015-06-01 17:45:55 +02:00
parent cf688ea738 af4650beb2
commit 408fd7ab59
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ExpressionCompiler.cpp
+5 -2
View File
@@ -1106,8 +1106,11 @@ void ExpressionCompiler::appendExternalFunctionCall(
m_context << eth::Instruction::CALLCODE;
else
m_context << eth::Instruction::CALL;
auto tag = m_context.appendConditionalJump();
m_context << eth::Instruction::STOP << tag; // STOP if CALL leaves 0.
//Propagate error condition (if CALL pushes 0 on stack).
m_context << eth::Instruction::ISZERO;
m_context.appendConditionalJumpTo(m_context.errorTag());
if (_functionType.valueSet())
m_context << eth::Instruction::POP;
if (_functionType.gasSet())