diff options
| author | Paweł Bylica <chfast@gmail.com> | 2015-06-02 17:57:13 +0800 |
|---|---|---|
| committer | Paweł Bylica <chfast@gmail.com> | 2015-06-02 17:57:13 +0800 |
| commit | 6a64d187803ef355dd0be22903a0e16c447b1348 (patch) | |
| tree | f555ba9e1463cddf1d0750f8250968b946a51895 /libsolidity/SolidityOptimizer.cpp | |
| parent | bef2f9ea2cd1b09f80dcec032a2c31a4bb0f1acd (diff) | |
| parent | 8f3e1cd127a75a2f877b8ef1e727d07a76f0cfa9 (diff) | |
| download | dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.gz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.bz2 dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.lz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.xz dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.tar.zst dexon-solidity-6a64d187803ef355dd0be22903a0e16c447b1348.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
libethereum/Executive.h
Diffstat (limited to 'libsolidity/SolidityOptimizer.cpp')
| -rw-r--r-- | libsolidity/SolidityOptimizer.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/libsolidity/SolidityOptimizer.cpp b/libsolidity/SolidityOptimizer.cpp index 744fc48a..827d8833 100644 --- a/libsolidity/SolidityOptimizer.cpp +++ b/libsolidity/SolidityOptimizer.cpp @@ -1004,6 +1004,38 @@ BOOST_AUTO_TEST_CASE(block_deduplicator) BOOST_CHECK_EQUAL(pushTags.size(), 2); } +BOOST_AUTO_TEST_CASE(block_deduplicator_loops) +{ + AssemblyItems input{ + u256(0), + eth::Instruction::SLOAD, + AssemblyItem(PushTag, 1), + AssemblyItem(PushTag, 2), + eth::Instruction::JUMPI, + eth::Instruction::JUMP, + AssemblyItem(Tag, 1), + u256(5), + u256(6), + eth::Instruction::SSTORE, + AssemblyItem(PushTag, 1), + eth::Instruction::JUMP, + AssemblyItem(Tag, 2), + u256(5), + u256(6), + eth::Instruction::SSTORE, + AssemblyItem(PushTag, 2), + eth::Instruction::JUMP, + }; + BlockDeduplicator dedup(input); + dedup.deduplicate(); + + set<u256> pushTags; + for (AssemblyItem const& item: input) + if (item.type() == PushTag) + pushTags.insert(item.data()); + BOOST_CHECK_EQUAL(pushTags.size(), 1); +} + BOOST_AUTO_TEST_SUITE_END() } |