Address feedback from code review.

2 files changed, 6 insertions, 6 deletions

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 45450350..3bb6c953 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -222,9 +222,9 @@ CompilerContext& CompilerContext::appendInvalid()
 
 CompilerContext& CompilerContext::appendConditionalInvalid()
 {
-	eth::AssemblyItem falseTag = appendConditionalJump();
-	eth::AssemblyItem endTag = appendJumpToNew();
-	return *this << falseTag << Instruction::INVALID << endTag;
+	*this << Instruction::ISZERO;
+	eth::AssemblyItem afterTag = appendConditionalJump();
+	return *this << Instruction::INVALID << afterTag;
 }
 
 void CompilerContext::resetVisitedNodes(ASTNode const* _node)
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 56d03a05..3ca2f375 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -918,9 +918,9 @@ eth::AssemblyPointer ContractCompiler::cloneRuntime()
 	a << Instruction::DELEGATECALL;
 	//Propagate error condition (if DELEGATECALL pushes 0 on stack).
 	a << Instruction::ISZERO;
-	eth::AssemblyItem falseTag = a.appendJumpI();
-	eth::AssemblyItem endTag = a.appendJump().tag();
-	a << falseTag << Instruction::INVALID << endTag;
+	a << Instruction::ISZERO;
+	eth::AssemblyItem afterTag = a.appendJumpI();
+	a << Instruction::INVALID << afterTag;
 	//@todo adjust for larger return values, make this dynamic.
 	a << u256(0x20) << u256(0) << Instruction::RETURN;
 	return make_shared<eth::Assembly>(a);