cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce virtual blocks for function arguments.

Browse Source
This commit is contained in:
chriseth
2017-05-29 16:18:16 +02:00
parent 002df12d13
commit 4af55c78eb
5 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/inlineasm/AsmScopeFiller.cpp
+14 -7
View File
@@ -22,6 +22,7 @@
#include <libsolidity/inlineasm/AsmData.h>
#include <libsolidity/inlineasm/AsmScope.h>
#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
#include <libsolidity/interface/Exceptions.h>
#include <libsolidity/interface/Utils.h>
@@ -36,8 +37,8 @@ using namespace dev;
using namespace dev::solidity;
using namespace dev::solidity::assembly;
ScopeFiller::ScopeFiller(ScopeFiller::Scopes& _scopes, ErrorList& _errors):
m_scopes(_scopes), m_errors(_errors)
ScopeFiller::ScopeFiller(AsmAnalysisInfo& _info, ErrorList& _errors):
m_info(_info), m_errors(_errors)
{
m_currentScope = &scope(nullptr);
}
@@ -84,16 +85,22 @@ bool ScopeFiller::operator()(assembly::FunctionDefinition const& _funDef)
));
success = false;
}
Scope& body = scope(&_funDef.body);
body.superScope = m_currentScope;
body.functionScope = true;
auto virtualBlock = m_info.virtualBlocks[&_funDef] = make_shared<Block>();
Scope& varScope = scope(virtualBlock.get());
varScope.superScope = m_currentScope;
m_currentScope = &varScope;
varScope.functionScope = true;
for (auto const& var: _funDef.arguments + _funDef.returns)
if (!registerVariable(var, _funDef.location, body))
if (!registerVariable(var, _funDef.location, varScope))
success = false;
if (!(*this)(_funDef.body))
success = false;
solAssert(m_currentScope == &varScope, "");
m_currentScope = m_currentScope->superScope;
return success;
}
@@ -137,7 +144,7 @@ bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const&
Scope& ScopeFiller::scope(Block const* _block)
{
auto& scope = m_scopes[_block];
auto& scope = m_info.scopes[_block];
if (!scope)
scope = make_shared<Scope>();
return *scope;