diff options
| author | chriseth <chris@ethereum.org> | 2018-11-14 02:33:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 02:33:35 +0800 |
| commit | 1d4f565a64988a3400847d2655ca24f73f234bc6 (patch) | |
| tree | caaa6c26e307513505349b50ca4f2a8a9506752b /test/libevmasm/Optimiser.cpp | |
| parent | 59dbf8f1085b8b92e8b7eb0ce380cbeb642e97eb (diff) | |
| parent | 91b6b8a88e76016e0324036cb7a7f9300a1e2439 (diff) | |
| download | dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.gz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.bz2 dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.lz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.xz dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.tar.zst dexon-solidity-1d4f565a64988a3400847d2655ca24f73f234bc6.zip | |
Merge pull request #5416 from ethereum/develop
Merge develop into release for 0.5.0
Diffstat (limited to 'test/libevmasm/Optimiser.cpp')
| -rw-r--r-- | test/libevmasm/Optimiser.cpp | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp index 4b399a14..c01e8758 100644 --- a/test/libevmasm/Optimiser.cpp +++ b/test/libevmasm/Optimiser.cpp @@ -30,7 +30,6 @@ #include <libevmasm/Assembly.h> #include <boost/test/unit_test.hpp> -#include <boost/lexical_cast.hpp> #include <string> #include <tuple> @@ -967,6 +966,31 @@ BOOST_AUTO_TEST_CASE(peephole_swap_comparison) } } +BOOST_AUTO_TEST_CASE(peephole_truthy_and) +{ + AssemblyItems items{ + AssemblyItem(Tag, 1), + Instruction::BALANCE, + u256(0), + Instruction::NOT, + Instruction::AND, + AssemblyItem(PushTag, 1), + Instruction::JUMPI + }; + AssemblyItems expectation{ + AssemblyItem(Tag, 1), + Instruction::BALANCE, + AssemblyItem(PushTag, 1), + Instruction::JUMPI + }; + PeepholeOptimiser peepOpt(items); + BOOST_REQUIRE(peepOpt.optimise()); + BOOST_CHECK_EQUAL_COLLECTIONS( + items.begin(), items.end(), + expectation.begin(), expectation.end() + ); +} + BOOST_AUTO_TEST_CASE(jumpdest_removal) { AssemblyItems items{ |