[cond-expr] make the codegen one instruction less

This commit is contained in:
Lu Guanqun 2015-12-23 16:09:29 +00:00
parent db6ce6d8a1
commit c781b130ef

View File

@ -180,13 +180,12 @@ bool ExpressionCompiler::visit(Conditional const& _condition)
{ {
CompilerContext::LocationSetter locationSetter(m_context, _condition); CompilerContext::LocationSetter locationSetter(m_context, _condition);
_condition.condition().accept(*this); _condition.condition().accept(*this);
m_context << eth::Instruction::ISZERO; eth::AssemblyItem trueTag = m_context.appendConditionalJump();
eth::AssemblyItem falseTag = m_context.appendConditionalJump();
_condition.trueExpression().accept(*this);
eth::AssemblyItem endTag = m_context.appendJumpToNew();
m_context << falseTag;
m_context.adjustStackOffset(-1);
_condition.falseExpression().accept(*this); _condition.falseExpression().accept(*this);
eth::AssemblyItem endTag = m_context.appendJumpToNew();
m_context << trueTag;
m_context.adjustStackOffset(-1);
_condition.trueExpression().accept(*this);
m_context << endTag; m_context << endTag;
return false; return false;
} }