Merge remote-tracking branch 'origin/develop' into develop_060

This commit is contained in:
chriseth
2019-12-03 21:17:15 +01:00
31 changed files with 202 additions and 232 deletions
+2 -2
View File
@@ -23,9 +23,9 @@
#include <libyul/AsmData.h>
#include <libyul/AsmScope.h>
#include <libyul/AsmAnalysisInfo.h>
#include <libyul/Exceptions.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Exceptions.h>
#include <libdevcore/CommonData.h>
@@ -74,7 +74,7 @@ bool ScopeFiller::operator()(FunctionDefinition const& _funDef)
if (!(*this)(_funDef.body))
success = false;
solAssert(m_currentScope == &varScope, "");
yulAssert(m_currentScope == &varScope, "");
m_currentScope = m_currentScope->superScope;
return success;