diff options
| author | Christian <c@ethdev.com> | 2014-11-03 23:13:40 +0800 |
|---|---|---|
| committer | Christian <c@ethdev.com> | 2014-11-03 23:13:40 +0800 |
| commit | e9f8ebe4dcee963111831b3c40708f0cdba9fc29 (patch) | |
| tree | 52b12efb23dad1cd673b7f29bd022847a11d5033 | |
| parent | 6d2b660ba7506d3f0b0ff3766a0735249e46ffcf (diff) | |
| parent | 577503539e5fe6c06edc3271b0b00d51f82e29c9 (diff) | |
| download | dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar.gz dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar.bz2 dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar.lz dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar.xz dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.tar.zst dexon-solidity-e9f8ebe4dcee963111831b3c40708f0cdba9fc29.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts:
alethzero/CMakeLists.txt
| -rw-r--r-- | Assembly.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assembly.cpp b/Assembly.cpp index 25895e1b..d4f6c0a7 100644 --- a/Assembly.cpp +++ b/Assembly.cpp @@ -413,8 +413,8 @@ bytes Assembly::assemble() const break; } case Tag: - ret.push_back((byte)Instruction::JUMPDEST); tagPos[(unsigned)i.m_data] = ret.size(); + ret.push_back((byte)Instruction::JUMPDEST); break; default:; } |