diff options
| author | chriseth <chris@ethereum.org> | 2017-10-18 20:53:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 20:53:45 +0800 |
| commit | 9cf6e910bd2b90d0c9415d9c257f85fe0c518de8 (patch) | |
| tree | 6423baec5e26bbe174005c1a89d978cae15015d8 /libevmasm/AssemblyItem.cpp | |
| parent | bdeb9e52a2211510644fb53df93fb98258b40a65 (diff) | |
| parent | c85c41880ad1c996517b0ae14f98678b1e6c5613 (diff) | |
| download | dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar.gz dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar.bz2 dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar.lz dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar.xz dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.tar.zst dexon-solidity-9cf6e910bd2b90d0c9415d9c257f85fe0c518de8.zip | |
Merge pull request #3099 from ethereum/develop
Merge develop into release for 0.4.18.
Diffstat (limited to 'libevmasm/AssemblyItem.cpp')
| -rw-r--r-- | libevmasm/AssemblyItem.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index cfe91be0..64963021 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -17,8 +17,6 @@ #include <libevmasm/AssemblyItem.h> -#include <libevmasm/SemanticInformation.h> - #include <libdevcore/CommonData.h> #include <libdevcore/FixedHash.h> @@ -112,7 +110,7 @@ bool AssemblyItem::canBeFunctional() const switch (m_type) { case Operation: - return !SemanticInformation::isDupInstruction(*this) && !SemanticInformation::isSwapInstruction(*this); + return !isDupInstruction(instruction()) && !isSwapInstruction(instruction()); case Push: case PushString: case PushTag: |