cerc-io/solidity
15
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

Make dialect a shared pointer.

Browse Source
This commit is contained in:
chriseth 2019-01-31 14:44:57 +01:00
parent 94607011dc
commit b34e104173
4 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/interface/AssemblyStack.cpp
View File

@ -134,7 +134,7 @@ void AssemblyStack::optimize(yul::Object& _object)
for (auto& subNode: _object.subObjects) for (auto& subNode: _object.subObjects)
if (auto subObject = dynamic_cast<yul::Object*>(subNode.get())) if (auto subObject = dynamic_cast<yul::Object*>(subNode.get()))
optimize(*subObject); optimize(*subObject);
yul::OptimiserSuite::run(*languageToDialect(m_language), *_object.code, *_object.analysisInfo); yul::OptimiserSuite::run(languageToDialect(m_language), *_object.code, *_object.analysisInfo);
} }
MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize) const MachineAssemblyObject AssemblyStack::assemble(Machine _machine, bool _optimize) const

82
libyul/optimiser/Suite.cpp
View File

@ -50,7 +50,7 @@ using namespace dev;
using namespace yul; using namespace yul;
void OptimiserSuite::run( void OptimiserSuite::run(
Dialect const& _dialect, shared_ptr<Dialect> const& _dialect,
Block& _ast, Block& _ast,
AsmAnalysisInfo const& _analysisInfo, AsmAnalysisInfo const& _analysisInfo,
set<YulString> const& _externallyUsedIdentifiers set<YulString> const& _externallyUsedIdentifiers
@ -58,52 +58,52 @@ void OptimiserSuite::run(
{ {
set<YulString> reservedIdentifiers = _externallyUsedIdentifiers; set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
Block ast = boost::get<Block>(Disambiguator(_dialect, _analysisInfo, reservedIdentifiers)(_ast)); Block ast = boost::get<Block>(Disambiguator(*_dialect, _analysisInfo, reservedIdentifiers)(_ast));
(VarDeclInitializer{})(ast); (VarDeclInitializer{})(ast);
(FunctionHoister{})(ast); (FunctionHoister{})(ast);
(BlockFlattener{})(ast); (BlockFlattener{})(ast);
(FunctionGrouper{})(ast); (FunctionGrouper{})(ast);
EquivalentFunctionCombiner::run(ast); EquivalentFunctionCombiner::run(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
(ForLoopInitRewriter{})(ast); (ForLoopInitRewriter{})(ast);
(BlockFlattener{})(ast); (BlockFlattener{})(ast);
StructuralSimplifier{_dialect}(ast); StructuralSimplifier{*_dialect}(ast);
NameDispenser dispenser{_dialect, ast}; NameDispenser dispenser{*_dialect, ast};
for (size_t i = 0; i < 4; i++) for (size_t i = 0; i < 4; i++)
{ {
ExpressionSplitter{_dialect, dispenser}(ast); ExpressionSplitter{*_dialect, dispenser}(ast);
SSATransform::run(ast, dispenser); SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
ExpressionSimplifier::run(_dialect, ast); ExpressionSimplifier::run(*_dialect, ast);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
StructuralSimplifier{_dialect}(ast); StructuralSimplifier{*_dialect}(ast);
(BlockFlattener{})(ast); (BlockFlattener{})(ast);
SSATransform::run(ast, dispenser); SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
SSAReverser::run(ast); SSAReverser::run(ast);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
ExpressionInliner(_dialect, ast).run(); ExpressionInliner(*_dialect, ast).run();
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
ExpressionSplitter{_dialect, dispenser}(ast); ExpressionSplitter{*_dialect, dispenser}(ast);
SSATransform::run(ast, dispenser); SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
(FunctionGrouper{})(ast); (FunctionGrouper{})(ast);
EquivalentFunctionCombiner::run(ast); EquivalentFunctionCombiner::run(ast);
@ -111,33 +111,33 @@ void OptimiserSuite::run(
(BlockFlattener{})(ast); (BlockFlattener{})(ast);
SSATransform::run(ast, dispenser); SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
ExpressionSimplifier::run(_dialect, ast); ExpressionSimplifier::run(*_dialect, ast);
StructuralSimplifier{_dialect}(ast); StructuralSimplifier{*_dialect}(ast);
(BlockFlattener{})(ast); (BlockFlattener{})(ast);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
SSATransform::run(ast, dispenser); SSATransform::run(ast, dispenser);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
RedundantAssignEliminator::run(_dialect, ast); RedundantAssignEliminator::run(*_dialect, ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
} }
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
Rematerialiser::run(_dialect, ast); Rematerialiser::run(*_dialect, ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
SSAReverser::run(ast); SSAReverser::run(ast);
CommonSubexpressionEliminator{_dialect}(ast); CommonSubexpressionEliminator{*_dialect}(ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
ExpressionJoiner::run(ast); ExpressionJoiner::run(ast);
Rematerialiser::run(_dialect, ast); Rematerialiser::run(*_dialect, ast);
UnusedPruner::runUntilStabilised(_dialect, ast, reservedIdentifiers); UnusedPruner::runUntilStabilised(*_dialect, ast, reservedIdentifiers);
_ast = std::move(ast); _ast = std::move(ast);
} }

2
libyul/optimiser/Suite.h
View File

@ -38,7 +38,7 @@ class OptimiserSuite
{ {
public: public:
static void run( static void run(
Dialect const& _dialect, std::shared_ptr<Dialect> const& _dialect,
Block& _ast, Block& _ast,
AsmAnalysisInfo const& _analysisInfo, AsmAnalysisInfo const& _analysisInfo,
std::set<YulString> const& _externallyUsedIdentifiers = {} std::set<YulString> const& _externallyUsedIdentifiers = {}

2
test/libyul/YulOptimizerTest.cpp
View File

@ -242,7 +242,7 @@ bool YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool con
UnusedPruner::runUntilStabilised(*m_dialect, *m_ast); UnusedPruner::runUntilStabilised(*m_dialect, *m_ast);
} }
else if (m_optimizerStep == "fullSuite") else if (m_optimizerStep == "fullSuite")
OptimiserSuite::run(*m_dialect, *m_ast, *m_analysisInfo); OptimiserSuite::run(m_dialect, *m_ast, *m_analysisInfo);
else else
{ {
FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl; FormattedScope(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;