diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2016-11-15 19:17:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 19:17:33 +0800 |
| commit | 0072160d7772b2f30c2c6af4428728cb31641696 (patch) | |
| tree | 09f1727e66af08220aee16e2230b8ecea5ff06a1 /libsolidity | |
| parent | 634b0998ba5a6b5d655dd86614da679fb51109d7 (diff) | |
| parent | ae8403ed08cf3b2b5bec1d3f8da0c6c7425a4d5a (diff) | |
| download | dexon-solidity-0072160d7772b2f30c2c6af4428728cb31641696.tar.gz dexon-solidity-0072160d7772b2f30c2c6af4428728cb31641696.tar.zst dexon-solidity-0072160d7772b2f30c2c6af4428728cb31641696.zip | |
Merge pull request #1327 from ethereum/inline-assembly-errortag
ErrorTag in inline assembly
Diffstat (limited to 'libsolidity')
| -rw-r--r-- | libsolidity/inlineasm/AsmCodeGen.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp index 76c71048..771f1042 100644 --- a/libsolidity/inlineasm/AsmCodeGen.cpp +++ b/libsolidity/inlineasm/AsmCodeGen.cpp @@ -81,7 +81,11 @@ struct GeneratorState class LabelOrganizer: public boost::static_visitor<> { public: - LabelOrganizer(GeneratorState& _state): m_state(_state) {} + LabelOrganizer(GeneratorState& _state): m_state(_state) + { + // Make the Solidity ErrorTag available to inline assembly + m_state.labels.insert(make_pair("invalidJumpLabel", m_state.assembly.errorTag())); + } template <class T> void operator()(T const& /*_item*/) { } |