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

Remove VarDeclPropagator.

Browse Source
This commit is contained in:
chriseth
2018-12-13 16:51:10 +01:00
parent 6c6a53a439
commit bc22a25a60
14 changed files with 3 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libyul/optimiser/Suite.cpp
-7
View File
@@ -36,7 +36,6 @@
#include <libyul/optimiser/SSATransform.h>
#include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/RedundantAssignEliminator.h>
#include <libyul/optimiser/VarDeclPropagator.h>
#include <libyul/AsmAnalysisInfo.h>
#include <libyul/AsmData.h>
#include <libyul/AsmPrinter.h>
@@ -70,7 +69,6 @@ void OptimiserSuite::run(
ExpressionSplitter{dispenser}(ast);
SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(ast);
VarDeclPropagator{}(ast);
RedundantAssignEliminator::run(ast);
CommonSubexpressionEliminator{}(ast);
@@ -97,27 +95,22 @@ void OptimiserSuite::run(
RedundantAssignEliminator::run(ast);
CommonSubexpressionEliminator{}(ast);
FullInliner{ast, dispenser}.run();
VarDeclPropagator{}(ast);
SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(ast);
VarDeclPropagator{}(ast);
RedundantAssignEliminator::run(ast);
ExpressionSimplifier::run(ast);
StructuralSimplifier{}(ast);
CommonSubexpressionEliminator{}(ast);
SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(ast);
VarDeclPropagator{}(ast);
RedundantAssignEliminator::run(ast);
UnusedPruner::runUntilStabilised(ast, reservedIdentifiers);
}
ExpressionJoiner::run(ast);
VarDeclPropagator{}(ast);
UnusedPruner::runUntilStabilised(ast);
ExpressionJoiner::run(ast);
UnusedPruner::runUntilStabilised(ast);
ExpressionJoiner::run(ast);
VarDeclPropagator{}(ast);
UnusedPruner::runUntilStabilised(ast);
ExpressionJoiner::run(ast);
UnusedPruner::runUntilStabilised(ast);
libyul/optimiser/VarDeclPropagator.cpp
-126
View File
@@ -1,126 +0,0 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
#include <libyul/optimiser/VarDeclPropagator.h>
#include <libyul/AsmData.h>
#include <libdevcore/CommonData.h>
#include <boost/range/algorithm_ext/erase.hpp>
#include <algorithm>
#include <map>
using namespace std;
using namespace dev;
using namespace yul;
void VarDeclPropagator::operator()(Block& _block)
{
map<YulString, TypedName> outerEmptyVarDecls;
map<YulString, TypedName> outerLazyInitializedVarDecls;
swap(m_emptyVarDecls, outerEmptyVarDecls);
swap(m_lazyInitializedVarDecls, outerLazyInitializedVarDecls);
ASTModifier::operator()(_block);
iterateReplacing(
_block.statements,
[this](Statement& _stmt) -> boost::optional<vector<Statement>>
{
if (_stmt.type() == typeid(VariableDeclaration))
{
VariableDeclaration& varDecl = boost::get<VariableDeclaration>(_stmt);
boost::remove_erase_if(
varDecl.variables,
[&](TypedName const& _typedName) { return m_lazyInitializedVarDecls.count(_typedName.name); }
);
if (varDecl.variables.empty())
return vector<Statement>{};
else
return {};
}
else if (_stmt.type() == typeid(Assignment))
{
Assignment& assignment = boost::get<Assignment>(_stmt);
if (isFullyLazyInitialized(assignment.variableNames))
return vector<Statement>{recreateVariableDeclaration(assignment)};
else
return {};
}
else
return {};
}
);
swap(m_emptyVarDecls, outerEmptyVarDecls);
swap(m_lazyInitializedVarDecls, outerLazyInitializedVarDecls);
}
void VarDeclPropagator::operator()(VariableDeclaration& _varDecl)
{
if (_varDecl.value)
visit(*_varDecl.value);
else
for (TypedName const& typedName: _varDecl.variables)
m_emptyVarDecls[typedName.name] = typedName;
}
void VarDeclPropagator::operator()(Assignment& _assignment)
{
visit(*_assignment.value);
if (allVarNamesUninitialized(_assignment.variableNames))
for (Identifier const& ident: _assignment.variableNames)
m_lazyInitializedVarDecls[ident.name] = m_emptyVarDecls[ident.name];
for (Identifier& name: _assignment.variableNames)
(*this)(name);
}
void VarDeclPropagator::operator()(Identifier& _ident)
{
m_emptyVarDecls.erase(_ident.name);
}
bool VarDeclPropagator::allVarNamesUninitialized(vector<Identifier> const& _variableNames) const
{
return all_of(
begin(_variableNames),
end(_variableNames),
[&](Identifier const& _ident) -> bool { return m_emptyVarDecls.count(_ident.name); }
);
}
bool VarDeclPropagator::isFullyLazyInitialized(vector<Identifier> const& _variableNames) const
{
return all_of(
begin(_variableNames),
end(_variableNames),
[&](Identifier const& ident) -> bool { return m_lazyInitializedVarDecls.count(ident.name); }
);
}
VariableDeclaration VarDeclPropagator::recreateVariableDeclaration(Assignment& _assignment)
{
TypedNameList variables;
for (Identifier const& varName: _assignment.variableNames)
{
variables.emplace_back(move(m_lazyInitializedVarDecls.at(varName.name)));
m_lazyInitializedVarDecls.erase(varName.name);
}
return VariableDeclaration{move(_assignment.location), move(variables), std::move(_assignment.value)};
}
libyul/optimiser/VarDeclPropagator.h
-60
View File
@@ -1,60 +0,0 @@
/*
This file is part of solidity.
solidity is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
solidity is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with solidity. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <libyul/AsmDataForward.h>
#include <libyul/optimiser/ASTWalker.h>
#include <libyul/Exceptions.h>
#include <libyul/AsmDataForward.h>
#include <vector>
#include <set>
#include <map>
namespace yul
{
/**
* Rewrites Assignment statements into VariableDeclaration when the assignment's LHS
* variables had no value yet.
*
* It recursively walks through the AST and moves each declaration of variables to
* the first assignment within the same block (if possible)..
*/
class VarDeclPropagator: public ASTModifier
{
public:
using ASTModifier::operator();
void operator()(Block& _block) override;
void operator()(VariableDeclaration& _varDecl) override;
void operator()(Assignment& _assignment) override;
void operator()(Identifier& _ident) override;
private:
bool allVarNamesUninitialized(std::vector<Identifier> const& _variableNames) const;
bool isFullyLazyInitialized(std::vector<Identifier> const& _variableNames) const;
VariableDeclaration recreateVariableDeclaration(Assignment& _assignment);
private:
/// Holds a list of variables from current Block that have no value assigned yet.
std::map<YulString, TypedName> m_emptyVarDecls;
/// Holds a list variables (and their TypedName) within the current block.
std::map<YulString, TypedName> m_lazyInitializedVarDecls;
};
}