Merge pull request #1702 from ethereum/assertError

Change effect of assert to invalid opcode.
This commit is contained in:
Yoichi Hirai authored and GitHub committed 2017-03-03 18:25:50 +01:00
commit cfbbd89daf
5 files changed
+25 -27

No files matched your search

+2 -3
View File
@@ -885,9 +885,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
// jump if condition was met
m_context << Instruction::ISZERO << Instruction::ISZERO;
auto success = m_context.appendConditionalJump();
// condition was not met, abort
m_context << u256(0) << u256(0);
m_context << Instruction::REVERT;
// condition was not met, flag an error
m_context << Instruction::INVALID;
// the success branch
m_context << success;
break;