diff options
| author | chriseth <chris@ethereum.org> | 2018-11-24 00:02:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 00:02:03 +0800 |
| commit | 2e861bf1a0825d17386655cdaaa2c7371b6d2c5c (patch) | |
| tree | 3f58d9a183acf7e751fc8253fd167b8e243dafc4 | |
| parent | 9a94e503da84cc66f643b3972bf8ad4defa02060 (diff) | |
| parent | 69afd094aca6679f3a6c3efccd91aeeefba028b2 (diff) | |
| download | dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.gz dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.bz2 dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.lz dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.xz dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.zst dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.zip | |
Merge pull request #5472 from ethereum/assemblyAnnotationOutput
Jumps with annotations cannot be functional.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libevmasm/AssemblyItem.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Changelog.md b/Changelog.md index ca904ffc..ff26882d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ Compiler Features: Bugfixes: + * Assembly output: Do not mix in/out jump annotations with arguments. Build System: * Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67. diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp index a3a4d6b6..52f246d1 100644 --- a/libevmasm/AssemblyItem.cpp +++ b/libevmasm/AssemblyItem.cpp @@ -117,6 +117,8 @@ int AssemblyItem::returnValues() const bool AssemblyItem::canBeFunctional() const { + if (m_jumpType != JumpType::Ordinary) + return false; switch (m_type) { case Operation: |