diff options
| author | Christian <c@ethdev.com> | 2014-11-01 00:20:27 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-11-01 00:20:27 +0800 |
| commit | 25c0e08bdfd955d8fdc0e7563c718b6fbba6cd1c (patch) | |
| tree | 78e49ce681d0b9c5ce6d76b7dc6f445d114f918f /Compiler.cpp | |
| parent | a36db1f2412d700cc8b32f8331be103c73ea90cb (diff) | |
| parent | c45495afb96fcd9bf8b3ad965144a3436fc101a5 (diff) | |
| download | dexon-solidity-25c0e08bdfd955d8fdc0e7563c718b6fbba6cd1c.tar.gz dexon-solidity-25c0e08bdfd955d8fdc0e7563c718b6fbba6cd1c.tar.zst dexon-solidity-25c0e08bdfd955d8fdc0e7563c718b6fbba6cd1c.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
libsolidity/Compiler.cpp
libsolidity/Compiler.h
libsolidity/NameAndTypeResolver.h
libsolidity/Types.cpp
solc/main.cpp
test/solidityCompiler.cpp
Diffstat (limited to 'Compiler.cpp')
| -rw-r--r-- | Compiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Compiler.cpp b/Compiler.cpp index b1e3c3da..7909e070 100644 --- a/Compiler.cpp +++ b/Compiler.cpp @@ -243,7 +243,7 @@ bool Compiler::visit(WhileStatement& _whileStatement) m_context << loopStart; ExpressionCompiler::compileExpression(m_context, _whileStatement.getCondition()); - m_context << eth::Instruction::NOT; + m_context << eth::Instruction::ISZERO; m_context.appendConditionalJumpTo(loopEnd); _whileStatement.getBody().accept(*this); |