diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-11-27 10:48:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 10:48:45 +0800 |
| commit | 663ea4b5c6b437563b8ac3774fbfe640a97f5925 (patch) | |
| tree | 7d02c7542deeb16dc1baada49ff1b6fbf6b111a6 | |
| parent | 3c8771c760a97067aae8245e5d102ff8181db095 (diff) | |
| parent | 83f326525e20fe18ae69849b1f5604ef3e88954e (diff) | |
| download | dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar.gz dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar.bz2 dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar.lz dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar.xz dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.tar.zst dexon-solidity-663ea4b5c6b437563b8ac3774fbfe640a97f5925.zip | |
Merge pull request #3245 from ivanbakel/removeSolAssert
Remove use of solAssert in Jumpdest optimization
| -rw-r--r-- | libevmasm/JumpdestRemover.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libevmasm/JumpdestRemover.cpp b/libevmasm/JumpdestRemover.cpp index b6016798..60493a99 100644 --- a/libevmasm/JumpdestRemover.cpp +++ b/libevmasm/JumpdestRemover.cpp @@ -21,8 +21,6 @@ #include "JumpdestRemover.h" -#include <libsolidity/interface/Exceptions.h> - #include <libevmasm/AssemblyItem.h> using namespace std; @@ -45,7 +43,7 @@ bool JumpdestRemover::optimise(set<size_t> const& _tagsReferencedFromOutside) if (_item.type() != Tag) return false; auto asmIdAndTag = _item.splitForeignPushTag(); - solAssert(asmIdAndTag.first == size_t(-1), "Sub-assembly tag used as label."); + assertThrow(asmIdAndTag.first == size_t(-1), OptimizerException, "Sub-assembly tag used as label."); size_t tag = asmIdAndTag.second; return !references.count(tag); } |