diff options
| author | chriseth <chris@ethereum.org> | 2017-06-14 20:12:33 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 20:12:33 +0800 |
| commit | 43cfab70d0dfb7e5a6058ba2a84874f7622abb2f (patch) | |
| tree | e93dd49913dfcde29c52a9c42bdcb9e0ae66bfa6 /libsolidity/inlineasm/AsmAnalysis.cpp | |
| parent | c99c1c76f7ce2963b1401b53676ca3bbb0eadbea (diff) | |
| parent | 154002cda05a75203b625d23ce507787bd5fa5e4 (diff) | |
| download | dexon-solidity-43cfab70d0dfb7e5a6058ba2a84874f7622abb2f.tar.gz dexon-solidity-43cfab70d0dfb7e5a6058ba2a84874f7622abb2f.tar.zst dexon-solidity-43cfab70d0dfb7e5a6058ba2a84874f7622abb2f.zip | |
Merge pull request #2389 from ethereum/moveLabelIDs
Move LabelIDs to generation phase.
Diffstat (limited to 'libsolidity/inlineasm/AsmAnalysis.cpp')
| -rw-r--r-- | libsolidity/inlineasm/AsmAnalysis.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libsolidity/inlineasm/AsmAnalysis.cpp b/libsolidity/inlineasm/AsmAnalysis.cpp index 36ac0e75..7bcbde91 100644 --- a/libsolidity/inlineasm/AsmAnalysis.cpp +++ b/libsolidity/inlineasm/AsmAnalysis.cpp @@ -92,7 +92,7 @@ bool AsmAnalyzer::operator()(assembly::Identifier const& _identifier) if (m_currentScope->lookup(_identifier.name, Scope::Visitor( [&](Scope::Variable const& _var) { - if (!_var.active) + if (!m_activeVariables.count(&_var)) { m_errorReporter.declarationError( _identifier.location, @@ -187,7 +187,7 @@ bool AsmAnalyzer::operator()(assembly::VariableDeclaration const& _varDecl) for (auto const& variable: _varDecl.variables) { expectValidType(variable.type, variable.location); - boost::get<Scope::Variable>(m_currentScope->identifiers.at(variable.name)).active = true; + m_activeVariables.insert(&boost::get<Scope::Variable>(m_currentScope->identifiers.at(variable.name))); } m_info.stackHeightInfo[&_varDecl] = m_stackHeight; return success; @@ -201,7 +201,7 @@ bool AsmAnalyzer::operator()(assembly::FunctionDefinition const& _funDef) for (auto const& var: _funDef.arguments + _funDef.returns) { expectValidType(var.type, var.location); - boost::get<Scope::Variable>(varScope.identifiers.at(var.name)).active = true; + m_activeVariables.insert(&boost::get<Scope::Variable>(varScope.identifiers.at(var.name))); } int const stackHeight = m_stackHeight; @@ -384,7 +384,7 @@ bool AsmAnalyzer::checkAssignment(assembly::Identifier const& _variable, size_t m_errorReporter.typeError(_variable.location, "Assignment requires variable."); success = false; } - else if (!boost::get<Scope::Variable>(*var).active) + else if (!m_activeVariables.count(&boost::get<Scope::Variable>(*var))) { m_errorReporter.declarationError( _variable.location, |