diff options
| author | chriseth <chris@ethereum.org> | 2018-12-11 02:22:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 02:22:02 +0800 |
| commit | baaefb4b422fb22a89af08b79e6595e7859d2323 (patch) | |
| tree | 1a04773f8ac16ee5722446009da4494bf3a10ebb /libevmasm/BlockDeduplicator.cpp | |
| parent | 5355380f80eeb9fac49dd28a32b08ba88e662c87 (diff) | |
| parent | cb935fe9086b60295f97c5b8a5fd0ea8245d145e (diff) | |
| download | dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.gz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.bz2 dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.lz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.xz dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.tar.zst dexon-solidity-baaefb4b422fb22a89af08b79e6595e7859d2323.zip | |
Merge pull request #5619 from ethereum/cleanup-abc
Some code cleanup
Diffstat (limited to 'libevmasm/BlockDeduplicator.cpp')
| -rw-r--r-- | libevmasm/BlockDeduplicator.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libevmasm/BlockDeduplicator.cpp b/libevmasm/BlockDeduplicator.cpp index b7c69531..ca439925 100644 --- a/libevmasm/BlockDeduplicator.cpp +++ b/libevmasm/BlockDeduplicator.cpp @@ -41,7 +41,7 @@ bool BlockDeduplicator::deduplicate() // Virtual tag that signifies "the current block" and which is used to optimise loops. // We abort if this virtual tag actually exists. - AssemblyItem pushSelf(PushTag, u256(-4)); + AssemblyItem pushSelf{PushTag, u256(-4)}; if ( std::count(m_items.cbegin(), m_items.cend(), pushSelf.tag()) || std::count(m_items.cbegin(), m_items.cend(), pushSelf.pushTag()) @@ -55,17 +55,17 @@ bool BlockDeduplicator::deduplicate() // To compare recursive loops, we have to already unify PushTag opcodes of the // block's own tag. - AssemblyItem pushFirstTag(pushSelf); - AssemblyItem pushSecondTag(pushSelf); + AssemblyItem pushFirstTag{pushSelf}; + AssemblyItem pushSecondTag{pushSelf}; if (_i < m_items.size() && m_items.at(_i).type() == Tag) pushFirstTag = m_items.at(_i).pushTag(); if (_j < m_items.size() && m_items.at(_j).type() == Tag) pushSecondTag = m_items.at(_j).pushTag(); - BlockIterator first(m_items.begin() + _i, m_items.end(), &pushFirstTag, &pushSelf); - BlockIterator second(m_items.begin() + _j, m_items.end(), &pushSecondTag, &pushSelf); - BlockIterator end(m_items.end(), m_items.end()); + BlockIterator first{m_items.begin() + _i, m_items.end(), &pushFirstTag, &pushSelf}; + BlockIterator second{m_items.begin() + _j, m_items.end(), &pushSecondTag, &pushSelf}; + BlockIterator end{m_items.end(), m_items.end()}; if (first != end && (*first).type() == Tag) ++first; @@ -126,7 +126,7 @@ BlockDeduplicator::BlockIterator& BlockDeduplicator::BlockIterator::operator++() { if (it == end) return *this; - if (SemanticInformation::altersControlFlow(*it) && *it != AssemblyItem(Instruction::JUMPI)) + if (SemanticInformation::altersControlFlow(*it) && *it != AssemblyItem{Instruction::JUMPI}) it = end; else { |