From 82055cbb615054725770dc9781b53e751c257474 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 13 Nov 2018 10:57:15 +0100 Subject: Jumps with annotations cannot be functional. --- libevmasm/AssemblyItem.cpp | 2 ++ 1 file changed, 2 insertions(+) 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: -- cgit v1.2.3 From 69afd094aca6679f3a6c3efccd91aeeefba028b2 Mon Sep 17 00:00:00 2001 From: chriseth Date: Tue, 13 Nov 2018 10:58:51 +0100 Subject: Changelog entry. --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 449798a4..df1c6d40 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,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. -- cgit v1.2.3