diff options
| author | chriseth <chris@ethereum.org> | 2017-05-05 20:25:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 20:25:43 +0800 |
| commit | 0582fcb93b2407379b5e4e4ce55c3f418e7ff433 (patch) | |
| tree | 2770da9c5727476ff8b1ad8559cb81335f25b400 /libsolidity/inlineasm | |
| parent | 2d89cfaa91bcc36db415b5c07f1bd821398da96e (diff) | |
| parent | 28f10f4783bd4365654191740069a7112be03d92 (diff) | |
| download | dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.tar.gz dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.tar.zst dexon-solidity-0582fcb93b2407379b5e4e4ce55c3f418e7ff433.zip | |
Merge pull request #2194 from ethereum/removeerrorlabel
Remove error label / invalid jump label.
Diffstat (limited to 'libsolidity/inlineasm')
| -rw-r--r-- | libsolidity/inlineasm/AsmCodeGen.cpp | 2 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmScope.h | 1 | ||||
| -rw-r--r-- | libsolidity/inlineasm/AsmScopeFiller.cpp | 4 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp index 9ef3e6e7..c19667b4 100644 --- a/libsolidity/inlineasm/AsmCodeGen.cpp +++ b/libsolidity/inlineasm/AsmCodeGen.cpp @@ -278,8 +278,6 @@ private: { if (_label.id == Scope::Label::unassignedLabelId) _label.id = m_state.newLabelId(); - else if (_label.id == Scope::Label::errorLabelId) - _label.id = size_t(m_state.assembly.errorTag().data()); } diff --git a/libsolidity/inlineasm/AsmScope.h b/libsolidity/inlineasm/AsmScope.h index 37e0f0b8..b70bee67 100644 --- a/libsolidity/inlineasm/AsmScope.h +++ b/libsolidity/inlineasm/AsmScope.h @@ -73,7 +73,6 @@ struct Scope struct Label { size_t id = unassignedLabelId; - static const size_t errorLabelId = -1; static const size_t unassignedLabelId = 0; }; diff --git a/libsolidity/inlineasm/AsmScopeFiller.cpp b/libsolidity/inlineasm/AsmScopeFiller.cpp index de6fbdaa..4a651388 100644 --- a/libsolidity/inlineasm/AsmScopeFiller.cpp +++ b/libsolidity/inlineasm/AsmScopeFiller.cpp @@ -39,10 +39,6 @@ using namespace dev::solidity::assembly; ScopeFiller::ScopeFiller(ScopeFiller::Scopes& _scopes, ErrorList& _errors): m_scopes(_scopes), m_errors(_errors) { - // Make the Solidity ErrorTag available to inline assembly - Scope::Label errorLabel; - errorLabel.id = Scope::Label::errorLabelId; - scope(nullptr).identifiers["invalidJumpLabel"] = errorLabel; m_currentScope = &scope(nullptr); } |