diff options
| author | chriseth <chris@ethereum.org> | 2017-10-17 04:11:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 04:11:45 +0800 |
| commit | 7989fc4c356929de47e2d696ef5478c398941508 (patch) | |
| tree | 35cfd7db3b44364243b295c3e6f19d05beb1a996 /libevmasm/Assembly.cpp | |
| parent | 18a72dbe4668e23aaf38404183b978fbbb1824d1 (diff) | |
| parent | f5e91e4a94b01daf2bbde637abef1796f063c348 (diff) | |
| download | dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar.gz dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar.bz2 dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar.lz dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar.xz dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.tar.zst dexon-solidity-7989fc4c356929de47e2d696ef5478c398941508.zip | |
Merge pull request #3077 from ethereum/optimze_pops
Assume peephole optimizer was successful if number of pops increased.
Diffstat (limited to 'libevmasm/Assembly.cpp')
| -rw-r--r-- | libevmasm/Assembly.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp index df691e7d..5fab24e1 100644 --- a/libevmasm/Assembly.cpp +++ b/libevmasm/Assembly.cpp @@ -408,7 +408,10 @@ map<u256, u256> Assembly::optimiseInternal( { PeepholeOptimiser peepOpt(m_items); while (peepOpt.optimise()) + { count++; + assertThrow(count < 64000, OptimizerException, "Peephole optimizer seems to be stuck."); + } } // This only modifies PushTags, we have to run again to actually remove code. |