cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5472 from ethereum/assemblyAnnotationOutput

Browse Source 
Jumps with annotations cannot be functional.
This commit is contained in:
chriseth 2018-11-23 17:02:03 +01:00 committed by GitHub
commit 2e861bf1a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -13,6 +13,7 @@ Compiler Features:
Bugfixes: Bugfixes:
* Assembly output: Do not mix in/out jump annotations with arguments.
Build System: Build System:
* Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67. * Emscripten: Upgrade to Emscripten SDK 1.37.21 and boost 1.67.

2
libevmasm/AssemblyItem.cpp
View File

@ -117,6 +117,8 @@ int AssemblyItem::returnValues() const
bool AssemblyItem::canBeFunctional() const bool AssemblyItem::canBeFunctional() const
{ {
if (m_jumpType != JumpType::Ordinary)
return false;
switch (m_type) switch (m_type)
{ {
case Operation: case Operation: