aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity/inlineasm/AsmStack.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libsolidity/inlineasm/AsmStack.cpp')
-rw-r--r--libsolidity/inlineasm/AsmStack.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/libsolidity/inlineasm/AsmStack.cpp b/libsolidity/inlineasm/AsmStack.cpp
index 146fc114..1903de42 100644
--- a/libsolidity/inlineasm/AsmStack.cpp
+++ b/libsolidity/inlineasm/AsmStack.cpp
@@ -62,8 +62,11 @@ string InlineAssemblyStack::toString()
eth::Assembly InlineAssemblyStack::assemble()
{
- CodeGenerator codeGen(*m_parserResult, m_errors);
- return codeGen.assemble();
+ AsmAnalyzer::Scopes scopes;
+ AsmAnalyzer analyzer(scopes, m_errors);
+ solAssert(analyzer.analyze(*m_parserResult), "");
+ CodeGenerator codeGen(m_errors);
+ return codeGen.assemble(*m_parserResult, scopes);
}
bool InlineAssemblyStack::parseAndAssemble(
@@ -78,7 +81,10 @@ bool InlineAssemblyStack::parseAndAssemble(
if (!errors.empty())
return false;
- CodeGenerator(*parserResult, errors).assemble(_assembly, _identifierAccess);
+ AsmAnalyzer::Scopes scopes;
+ AsmAnalyzer analyzer(scopes, m_errors);
+ solAssert(analyzer.analyze(*m_parserResult), "");
+ CodeGenerator(errors).assemble(*parserResult, scopes, _assembly, _identifierAccess);
// At this point, the assembly might be messed up, but we should throw an
// internal compiler error anyway.