diff options
| author | chriseth <chris@ethereum.org> | 2018-03-05 19:10:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 19:10:49 +0800 |
| commit | 6dc137317fa8249a9c1b19ff6430840974393f90 (patch) | |
| tree | 2263fd97b42da5673b1dcce24ab4419ce8dc67b9 /libevmasm/PathGasMeter.cpp | |
| parent | e3c2ab39a125e68aea07ba9c8cacb0a55293bf0d (diff) | |
| parent | 6ec4517929e8c0eca022f4771ba217db5d80beed (diff) | |
| download | dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.gz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.bz2 dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.lz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.xz dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.tar.zst dexon-solidity-6dc137317fa8249a9c1b19ff6430840974393f90.zip | |
Merge pull request #3569 from ethereum/evmVersion
EVM version
Diffstat (limited to 'libevmasm/PathGasMeter.cpp')
| -rw-r--r-- | libevmasm/PathGasMeter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp index c56e2f8b..3fe682b7 100644 --- a/libevmasm/PathGasMeter.cpp +++ b/libevmasm/PathGasMeter.cpp @@ -27,8 +27,8 @@ using namespace std; using namespace dev; using namespace dev::eth; -PathGasMeter::PathGasMeter(AssemblyItems const& _items): - m_items(_items) +PathGasMeter::PathGasMeter(AssemblyItems const& _items, solidity::EVMVersion _evmVersion): + m_items(_items), m_evmVersion(_evmVersion) { for (size_t i = 0; i < m_items.size(); ++i) if (m_items[i].type() == Tag) @@ -59,7 +59,7 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem() m_queue.pop_back(); shared_ptr<KnownState> state = path->state; - GasMeter meter(state, path->largestMemoryAccess); + GasMeter meter(state, m_evmVersion, path->largestMemoryAccess); ExpressionClasses& classes = state->expressionClasses(); GasMeter::GasConsumption gas = path->gas; size_t index = path->index; |