aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-02-24 15:26:45 +0800
committerGitHub <noreply@github.com>2017-02-24 15:26:45 +0800
commitbec3c6fab6bf02aea5664be4423f45e98db22e8e (patch)
tree10d5e6dddb828e7a2175d7373dbafda79d211c1f
parent6bbba106a7d243d5a31a74ccb16e7206bb88316a (diff)
parentde1317331f2607cc1e89779ccfd0ffa812628642 (diff)
downloaddexon-solidity-bec3c6fab6bf02aea5664be4423f45e98db22e8e.tar.gz
dexon-solidity-bec3c6fab6bf02aea5664be4423f45e98db22e8e.tar.zst
dexon-solidity-bec3c6fab6bf02aea5664be4423f45e98db22e8e.zip
Merge pull request #1706 from ethereum/fixasmlocation
Print source location before items.
-rw-r--r--Changelog.md1
-rw-r--r--libevmasm/Assembly.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md
index 45aaf04a..1d61f09d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Bugfixes:
* Type system: Fix a crash caused by continuing on fatal errors in the code.
* Type system: Disallow arrays with negative length.
* Inline assembly: Charge one stack slot for non-value types during analysis.
+ * Assembly output: Print source location before the operation it refers to instead of after.
### 0.4.9 (2017-01-31)
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index b7859c1f..f12e8aa8 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -130,8 +130,8 @@ public:
if (!_item.location().isEmpty() && _item.location() != m_location)
{
flush();
- printLocation();
m_location = _item.location();
+ printLocation();
}
if (!(
_item.canBeFunctional() &&