aboutsummaryrefslogtreecommitdiffstats
path: root/libevmasm
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-11-24 00:02:03 +0800
committerGitHub <noreply@github.com>2018-11-24 00:02:03 +0800
commit2e861bf1a0825d17386655cdaaa2c7371b6d2c5c (patch)
tree3f58d9a183acf7e751fc8253fd167b8e243dafc4 /libevmasm
parent9a94e503da84cc66f643b3972bf8ad4defa02060 (diff)
parent69afd094aca6679f3a6c3efccd91aeeefba028b2 (diff)
downloaddexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.gz
dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.tar.zst
dexon-solidity-2e861bf1a0825d17386655cdaaa2c7371b6d2c5c.zip
Merge pull request #5472 from ethereum/assemblyAnnotationOutput
Jumps with annotations cannot be functional.
Diffstat (limited to 'libevmasm')
-rw-r--r--libevmasm/AssemblyItem.cpp2
1 files changed, 2 insertions, 0 deletions
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: