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

Merge pull request #12310 from ethereum/renameRedundant

Browse Source 
Rename RedundantAssignEliminator to UnusedAssignEliminator.
This commit is contained in:
chriseth 2021-11-23 15:47:24 +01:00 committed by GitHub
commit 18d6792966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 87 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libyul/CMakeLists.txt
View File

@ -173,10 +173,10 @@ add_library(yul
optimiser/OptimizerUtilities.h optimiser/OptimizerUtilities.h
optimiser/ReasoningBasedSimplifier.cpp optimiser/ReasoningBasedSimplifier.cpp
optimiser/ReasoningBasedSimplifier.h optimiser/ReasoningBasedSimplifier.h
optimiser/RedundantAssignEliminator.cpp optimiser/UnusedAssignEliminator.cpp
optimiser/RedundantAssignEliminator.h optimiser/UnusedAssignEliminator.h
optimiser/RedundantStoreBase.cpp optimiser/UnusedStoreBase.cpp
optimiser/RedundantStoreBase.h optimiser/UnusedStoreBase.h
optimiser/Rematerialiser.cpp optimiser/Rematerialiser.cpp
optimiser/Rematerialiser.h optimiser/Rematerialiser.h
optimiser/SMTSolver.cpp optimiser/SMTSolver.cpp

2
libyul/optimiser/SSATransform.h
View File

@ -70,7 +70,7 @@ class NameDispenser;
* variable references can use the SSA variable. The only exception to this rule are * variable references can use the SSA variable. The only exception to this rule are
* for loop conditions, as we cannot insert a variable declaration there. * for loop conditions, as we cannot insert a variable declaration there.
* *
* After this stage, redundantAssignmentRemover is recommended to remove the unnecessary * After this stage, UnusedAssignmentEliminator is recommended to remove the unnecessary
* intermediate assignments. * intermediate assignments.
* *
* This stage provides best results if CSE is run right before it, because * This stage provides best results if CSE is run right before it, because

6
libyul/optimiser/Suite.cpp
View File

@ -55,7 +55,7 @@
#include <libyul/optimiser/StackLimitEvader.h> #include <libyul/optimiser/StackLimitEvader.h>
#include <libyul/optimiser/StructuralSimplifier.h> #include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/SyntacticalEquality.h> #include <libyul/optimiser/SyntacticalEquality.h>
#include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/UnusedAssignEliminator.h>
#include <libyul/optimiser/VarNameCleaner.h> #include <libyul/optimiser/VarNameCleaner.h>
#include <libyul/optimiser/LoadResolver.h> #include <libyul/optimiser/LoadResolver.h>
#include <libyul/optimiser/LoopInvariantCodeMotion.h> #include <libyul/optimiser/LoopInvariantCodeMotion.h>
@ -219,7 +219,7 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
LiteralRematerialiser, LiteralRematerialiser,
LoadResolver, LoadResolver,
LoopInvariantCodeMotion, LoopInvariantCodeMotion,
RedundantAssignEliminator, UnusedAssignEliminator,
ReasoningBasedSimplifier, ReasoningBasedSimplifier,
Rematerialiser, Rematerialiser,
SSAReverser, SSAReverser,
@ -260,7 +260,7 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
{LoadResolver::name, 'L'}, {LoadResolver::name, 'L'},
{LoopInvariantCodeMotion::name, 'M'}, {LoopInvariantCodeMotion::name, 'M'},
{ReasoningBasedSimplifier::name, 'R'}, {ReasoningBasedSimplifier::name, 'R'},
{RedundantAssignEliminator::name, 'r'}, {UnusedAssignEliminator::name, 'r'},
{Rematerialiser::name, 'm'}, {Rematerialiser::name, 'm'},
{SSAReverser::name, 'V'}, {SSAReverser::name, 'V'},
{SSATransform::name, 'a'}, {SSATransform::name, 'a'},

36
libyul/optimiser/RedundantAssignEliminator.cpp → libyul/optimiser/UnusedAssignEliminator.cpp
View File

@ -20,7 +20,7 @@
* until they go out of scope or are re-assigned. * until they go out of scope or are re-assigned.
*/ */
#include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/UnusedAssignEliminator.h>
#include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/Semantics.h>
#include <libyul/AST.h> #include <libyul/AST.h>
@ -33,36 +33,36 @@ using namespace std;
using namespace solidity; using namespace solidity;
using namespace solidity::yul; using namespace solidity::yul;
void RedundantAssignEliminator::run(OptimiserStepContext& _context, Block& _ast) void UnusedAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
{ {
RedundantAssignEliminator rae{_context.dialect}; UnusedAssignEliminator rae{_context.dialect};
rae(_ast); rae(_ast);
StatementRemover remover{rae.m_pendingRemovals}; StatementRemover remover{rae.m_pendingRemovals};
remover(_ast); remover(_ast);
} }
void RedundantAssignEliminator::operator()(Identifier const& _identifier) void UnusedAssignEliminator::operator()(Identifier const& _identifier)
{ {
changeUndecidedTo(_identifier.name, State::Used); changeUndecidedTo(_identifier.name, State::Used);
} }
void RedundantAssignEliminator::operator()(VariableDeclaration const& _variableDeclaration) void UnusedAssignEliminator::operator()(VariableDeclaration const& _variableDeclaration)
{ {
RedundantStoreBase::operator()(_variableDeclaration); UnusedStoreBase::operator()(_variableDeclaration);
for (auto const& var: _variableDeclaration.variables) for (auto const& var: _variableDeclaration.variables)
m_declaredVariables.emplace(var.name); m_declaredVariables.emplace(var.name);
} }
void RedundantAssignEliminator::operator()(Assignment const& _assignment) void UnusedAssignEliminator::operator()(Assignment const& _assignment)
{ {
visit(*_assignment.value); visit(*_assignment.value);
for (auto const& var: _assignment.variableNames) for (auto const& var: _assignment.variableNames)
changeUndecidedTo(var.name, State::Unused); changeUndecidedTo(var.name, State::Unused);
} }
void RedundantAssignEliminator::operator()(FunctionDefinition const& _functionDefinition) void UnusedAssignEliminator::operator()(FunctionDefinition const& _functionDefinition)
{ {
ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {}); ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
ScopedSaveAndRestore outerReturnVariables(m_returnVariables, {}); ScopedSaveAndRestore outerReturnVariables(m_returnVariables, {});
@ -70,28 +70,28 @@ void RedundantAssignEliminator::operator()(FunctionDefinition const& _functionDe
for (auto const& retParam: _functionDefinition.returnVariables) for (auto const& retParam: _functionDefinition.returnVariables)
m_returnVariables.insert(retParam.name); m_returnVariables.insert(retParam.name);
RedundantStoreBase::operator()(_functionDefinition); UnusedStoreBase::operator()(_functionDefinition);
} }
void RedundantAssignEliminator::operator()(Leave const&) void UnusedAssignEliminator::operator()(Leave const&)
{ {
for (YulString name: m_returnVariables) for (YulString name: m_returnVariables)
changeUndecidedTo(name, State::Used); changeUndecidedTo(name, State::Used);
} }
void RedundantAssignEliminator::operator()(Block const& _block) void UnusedAssignEliminator::operator()(Block const& _block)
{ {
ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {}); ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
RedundantStoreBase::operator()(_block); UnusedStoreBase::operator()(_block);
for (auto const& var: m_declaredVariables) for (auto const& var: m_declaredVariables)
finalize(var, State::Unused); finalize(var, State::Unused);
} }
void RedundantAssignEliminator::visit(Statement const& _statement) void UnusedAssignEliminator::visit(Statement const& _statement)
{ {
RedundantStoreBase::visit(_statement); UnusedStoreBase::visit(_statement);
if (auto const* assignment = get_if<Assignment>(&_statement)) if (auto const* assignment = get_if<Assignment>(&_statement))
if (assignment->variableNames.size() == 1) if (assignment->variableNames.size() == 1)
@ -99,7 +99,7 @@ void RedundantAssignEliminator::visit(Statement const& _statement)
m_stores[assignment->variableNames.front().name][&_statement]; m_stores[assignment->variableNames.front().name][&_statement];
} }
void RedundantAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRuns) void UnusedAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRuns)
{ {
// Shortcut to avoid horrible runtime: // Shortcut to avoid horrible runtime:
// Change all assignments that were newly introduced in the for loop to "used". // Change all assignments that were newly introduced in the for loop to "used".
@ -116,7 +116,7 @@ void RedundantAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRun
} }
} }
void RedundantAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition) void UnusedAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition)
{ {
for (auto const& param: _functionDefinition.parameters) for (auto const& param: _functionDefinition.parameters)
finalize(param.name, State::Unused); finalize(param.name, State::Unused);
@ -124,14 +124,14 @@ void RedundantAssignEliminator::finalizeFunctionDefinition(FunctionDefinition co
finalize(retParam.name, State::Used); finalize(retParam.name, State::Used);
} }
void RedundantAssignEliminator::changeUndecidedTo(YulString _variable, RedundantAssignEliminator::State _newState) void UnusedAssignEliminator::changeUndecidedTo(YulString _variable, UnusedAssignEliminator::State _newState)
{ {
for (auto& assignment: m_stores[_variable]) for (auto& assignment: m_stores[_variable])
if (assignment.second == State::Undecided) if (assignment.second == State::Undecided)
assignment.second = _newState; assignment.second = _newState;
} }
void RedundantAssignEliminator::finalize(YulString _variable, RedundantAssignEliminator::State _finalState) void UnusedAssignEliminator::finalize(YulString _variable, UnusedAssignEliminator::State _finalState)
{ {
std::map<Statement const*, State> stores = std::move(m_stores[_variable]); std::map<Statement const*, State> stores = std::move(m_stores[_variable]);
m_stores.erase(_variable); m_stores.erase(_variable);

10
libyul/optimiser/RedundantAssignEliminator.h → libyul/optimiser/UnusedAssignEliminator.h
View File

@ -25,7 +25,7 @@
#include <libyul/ASTForward.h> #include <libyul/ASTForward.h>
#include <libyul/optimiser/ASTWalker.h> #include <libyul/optimiser/ASTWalker.h>
#include <libyul/optimiser/OptimiserStep.h> #include <libyul/optimiser/OptimiserStep.h>
#include <libyul/optimiser/RedundantStoreBase.h> #include <libyul/optimiser/UnusedStoreBase.h>
#include <map> #include <map>
#include <vector> #include <vector>
@ -107,13 +107,13 @@ struct Dialect;
* *
* Prerequisite: Disambiguator, ForLoopInitRewriter. * Prerequisite: Disambiguator, ForLoopInitRewriter.
*/ */
class RedundantAssignEliminator: public RedundantStoreBase class UnusedAssignEliminator: public UnusedStoreBase
{ {
public: public:
static constexpr char const* name{"RedundantAssignEliminator"}; static constexpr char const* name{"UnusedAssignEliminator"};
static void run(OptimiserStepContext&, Block& _ast); static void run(OptimiserStepContext&, Block& _ast);
explicit RedundantAssignEliminator(Dialect const& _dialect): RedundantStoreBase(_dialect) {} explicit UnusedAssignEliminator(Dialect const& _dialect): UnusedStoreBase(_dialect) {}
void operator()(Identifier const& _identifier) override; void operator()(Identifier const& _identifier) override;
void operator()(VariableDeclaration const& _variableDeclaration) override; void operator()(VariableDeclaration const& _variableDeclaration) override;
@ -122,7 +122,7 @@ public:
void operator()(Leave const&) override; void operator()(Leave const&) override;
void operator()(Block const& _block) override; void operator()(Block const& _block) override;
using RedundantStoreBase::visit; using UnusedStoreBase::visit;
void visit(Statement const& _statement) override; void visit(Statement const& _statement) override;
private: private:

20
libyul/optimiser/RedundantStoreBase.cpp → libyul/optimiser/UnusedStoreBase.cpp
View File

@ -16,10 +16,10 @@
*/ */
// SPDX-License-Identifier: GPL-3.0 // SPDX-License-Identifier: GPL-3.0
/** /**
* Base class for both RedundantAssignEliminator and RedundantStoreEliminator. * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
*/ */
#include <libyul/optimiser/RedundantStoreBase.h> #include <libyul/optimiser/UnusedStoreBase.h>
#include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/OptimiserStep.h> #include <libyul/optimiser/OptimiserStep.h>
@ -33,7 +33,7 @@ using namespace std;
using namespace solidity; using namespace solidity;
using namespace solidity::yul; using namespace solidity::yul;
void RedundantStoreBase::operator()(If const& _if) void UnusedStoreBase::operator()(If const& _if)
{ {
visit(*_if.condition); visit(*_if.condition);
@ -43,7 +43,7 @@ void RedundantStoreBase::operator()(If const& _if)
merge(m_stores, move(skipBranch)); merge(m_stores, move(skipBranch));
} }
void RedundantStoreBase::operator()(Switch const& _switch) void UnusedStoreBase::operator()(Switch const& _switch)
{ {
visit(*_switch.expression); visit(*_switch.expression);
@ -69,7 +69,7 @@ void RedundantStoreBase::operator()(Switch const& _switch)
merge(m_stores, move(branch)); merge(m_stores, move(branch));
} }
void RedundantStoreBase::operator()(FunctionDefinition const& _functionDefinition) void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
{ {
ScopedSaveAndRestore outerAssignments(m_stores, {}); ScopedSaveAndRestore outerAssignments(m_stores, {});
ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {}); ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {});
@ -79,7 +79,7 @@ void RedundantStoreBase::operator()(FunctionDefinition const& _functionDefinitio
finalizeFunctionDefinition(_functionDefinition); finalizeFunctionDefinition(_functionDefinition);
} }
void RedundantStoreBase::operator()(ForLoop const& _forLoop) void UnusedStoreBase::operator()(ForLoop const& _forLoop)
{ {
ScopedSaveAndRestore outerForLoopInfo(m_forLoopInfo, {}); ScopedSaveAndRestore outerForLoopInfo(m_forLoopInfo, {});
ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, m_forLoopNestingDepth + 1); ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, m_forLoopNestingDepth + 1);
@ -127,19 +127,19 @@ void RedundantStoreBase::operator()(ForLoop const& _forLoop)
m_forLoopInfo.pendingBreakStmts.clear(); m_forLoopInfo.pendingBreakStmts.clear();
} }
void RedundantStoreBase::operator()(Break const&) void UnusedStoreBase::operator()(Break const&)
{ {
m_forLoopInfo.pendingBreakStmts.emplace_back(move(m_stores)); m_forLoopInfo.pendingBreakStmts.emplace_back(move(m_stores));
m_stores.clear(); m_stores.clear();
} }
void RedundantStoreBase::operator()(Continue const&) void UnusedStoreBase::operator()(Continue const&)
{ {
m_forLoopInfo.pendingContinueStmts.emplace_back(move(m_stores)); m_forLoopInfo.pendingContinueStmts.emplace_back(move(m_stores));
m_stores.clear(); m_stores.clear();
} }
void RedundantStoreBase::merge(TrackedStores& _target, TrackedStores&& _other) void UnusedStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
{ {
util::joinMap(_target, move(_other), []( util::joinMap(_target, move(_other), [](
map<Statement const*, State>& _assignmentHere, map<Statement const*, State>& _assignmentHere,
@ -150,7 +150,7 @@ void RedundantStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
}); });
} }
void RedundantStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source) void UnusedStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source)
{ {
for (TrackedStores& ts: _source) for (TrackedStores& ts: _source)
merge(_target, move(ts)); merge(_target, move(ts));

13
libyul/optimiser/RedundantStoreBase.h → libyul/optimiser/UnusedStoreBase.h
View File

@ -16,7 +16,7 @@
*/ */
// SPDX-License-Identifier: GPL-3.0 // SPDX-License-Identifier: GPL-3.0
/** /**
* Base class for both RedundantAssignEliminator and RedundantStoreEliminator. * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
*/ */
#pragma once #pragma once
@ -34,14 +34,19 @@ namespace solidity::yul
struct Dialect; struct Dialect;
/** /**
* Base class for both RedundantAssignEliminator and RedundantStoreEliminator. * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
*
* The class tracks the state of abstract "stores" (assignments or mstore/sstore
* statements) across the control-flow. It is the job of the derived class to create
* the stores and track references, but the base class adjusts their "used state" at
* control-flow splits and joins.
* *
* Prerequisite: Disambiguator, ForLoopInitRewriter. * Prerequisite: Disambiguator, ForLoopInitRewriter.
*/ */
class RedundantStoreBase: public ASTWalker class UnusedStoreBase: public ASTWalker
{ {
public: public:
explicit RedundantStoreBase(Dialect const& _dialect): m_dialect(_dialect) {} explicit UnusedStoreBase(Dialect const& _dialect): m_dialect(_dialect) {}
using ASTWalker::operator(); using ASTWalker::operator();
void operator()(If const& _if) override; void operator()(If const& _if) override;

10
test/libyul/YulOptimizerTestCommon.cpp
View File

@ -52,7 +52,7 @@
#include <libyul/optimiser/SSAReverser.h> #include <libyul/optimiser/SSAReverser.h>
#include <libyul/optimiser/SSATransform.h> #include <libyul/optimiser/SSATransform.h>
#include <libyul/optimiser/Semantics.h> #include <libyul/optimiser/Semantics.h>
#include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/UnusedAssignEliminator.h>
#include <libyul/optimiser/StructuralSimplifier.h> #include <libyul/optimiser/StructuralSimplifier.h>
#include <libyul/optimiser/StackCompressor.h> #include <libyul/optimiser/StackCompressor.h>
#include <libyul/optimiser/Suite.h> #include <libyul/optimiser/Suite.h>
@ -231,16 +231,16 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
ForLoopInitRewriter::run(*m_context, *m_ast); ForLoopInitRewriter::run(*m_context, *m_ast);
SSATransform::run(*m_context, *m_ast); SSATransform::run(*m_context, *m_ast);
}}, }},
{"redundantAssignEliminator", [&]() { {"unusedAssignEliminator", [&]() {
disambiguate(); disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast); ForLoopInitRewriter::run(*m_context, *m_ast);
RedundantAssignEliminator::run(*m_context, *m_ast); UnusedAssignEliminator::run(*m_context, *m_ast);
}}, }},
{"ssaPlusCleanup", [&]() { {"ssaPlusCleanup", [&]() {
disambiguate(); disambiguate();
ForLoopInitRewriter::run(*m_context, *m_ast); ForLoopInitRewriter::run(*m_context, *m_ast);
SSATransform::run(*m_context, *m_ast); SSATransform::run(*m_context, *m_ast);
RedundantAssignEliminator::run(*m_context, *m_ast); UnusedAssignEliminator::run(*m_context, *m_ast);
}}, }},
{"loadResolver", [&]() { {"loadResolver", [&]() {
disambiguate(); disambiguate();
@ -293,7 +293,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
ForLoopInitRewriter::run(*m_context, *m_ast); ForLoopInitRewriter::run(*m_context, *m_ast);
// apply SSA // apply SSA
SSATransform::run(*m_context, *m_ast); SSATransform::run(*m_context, *m_ast);
RedundantAssignEliminator::run(*m_context, *m_ast); UnusedAssignEliminator::run(*m_context, *m_ast);
// reverse SSA // reverse SSA
SSAReverser::run(*m_context, *m_ast); SSAReverser::run(*m_context, *m_ast);
FunctionHoister::run(*m_context, *m_ast); FunctionHoister::run(*m_context, *m_ast);

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
View File

@ -8,7 +8,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let a := 2 // let a := 2

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_branch.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
View File

@ -14,7 +14,7 @@
mstore(x, 0) mstore(x, 0)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_break.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
View File

@ -13,7 +13,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
View File

@ -16,7 +16,7 @@
x := 3 x := 3
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_2.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
View File

@ -13,7 +13,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_3.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
View File

@ -12,7 +12,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_decl_inside_break_continue.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
View File

@ -19,7 +19,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x := 1 // let x := 1

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_noremove.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
View File

@ -26,7 +26,7 @@
x := 13 x := 13
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x := 1 // let x := 1

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_simple.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
View File

@ -19,7 +19,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// for { } 1 { } // for { } 1 { }

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_multi_break.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
View File

@ -35,7 +35,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x := 1 // let x := 1

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_nested.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
View File

@ -32,7 +32,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x := 1 // let x := 1

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_rerun.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
View File

@ -11,7 +11,7 @@
x := 3 x := 3
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/for_stmnts_after_break_continue.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
View File

@ -23,7 +23,7 @@
mstore(x, 0x42) mstore(x, 0x42)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x := 1 // let x := 1

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/function.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
View File

@ -12,7 +12,7 @@
r := 2 r := 2
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let r // let r

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/if.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
View File

@ -10,7 +10,7 @@
mstore(0, d) mstore(0, d)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let c // let c

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/if_overwrite_all_branches.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
View File

@ -11,7 +11,7 @@
mstore(0, d) mstore(0, d)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let c // let c

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/if_used_in_one_branch.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
View File

@ -11,7 +11,7 @@
mstore(0, d) mstore(0, d)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let c // let c

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/leave.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
View File

@ -21,7 +21,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// function f(a, b) -> x // function f(a, b) -> x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/multi_assign.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
View File

@ -9,7 +9,7 @@
y := 4 y := 4
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// function f() -> a, b // function f() -> a, b

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/multivar.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
View File

@ -6,7 +6,7 @@
a := b a := b
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let a := 2 // let a := 2

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/non_movable.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
View File

@ -4,7 +4,7 @@
a := mload(0) a := mload(0)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let a // let a

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_break.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
View File

@ -12,7 +12,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let i := 0 // let i := 0

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_continue.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
View File

@ -13,7 +13,7 @@
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let i := 0 // let i := 0

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/scopes.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
View File

@ -7,7 +7,7 @@
} }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let a // let a

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/simple.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
View File

@ -4,6 +4,6 @@
a := 2 a := 2
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { let a } // { let a }

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_all.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
View File

@ -8,7 +8,7 @@
mstore(x, 0) mstore(x, 0)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_one.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
View File

@ -7,7 +7,7 @@
mstore(x, 0) mstore(x, 0)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_use_combination.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
View File

@ -8,7 +8,7 @@
mstore(x, 0) mstore(x, 0)
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

2
test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_unused.yul → test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
View File

@ -6,7 +6,7 @@
case 0 { mstore(0, 1) } case 0 { mstore(0, 1) }
} }
// ---- // ----
// step: redundantAssignEliminator // step: unusedAssignEliminator
// //
// { // {
// let x // let x

6
test/yulPhaser/Chromosome.cpp
View File

@ -30,7 +30,7 @@
#include <libyul/optimiser/ForLoopInitRewriter.h> #include <libyul/optimiser/ForLoopInitRewriter.h>
#include <libyul/optimiser/FunctionHoister.h> #include <libyul/optimiser/FunctionHoister.h>
#include <libyul/optimiser/LoopInvariantCodeMotion.h> #include <libyul/optimiser/LoopInvariantCodeMotion.h>
#include <libyul/optimiser/RedundantAssignEliminator.h> #include <libyul/optimiser/UnusedAssignEliminator.h>
#include <libyul/optimiser/Rematerialiser.h> #include <libyul/optimiser/Rematerialiser.h>
#include <libyul/optimiser/Suite.h> #include <libyul/optimiser/Suite.h>
#include <libyul/optimiser/StructuralSimplifier.h> #include <libyul/optimiser/StructuralSimplifier.h>
@ -50,7 +50,7 @@ namespace solidity::phaser::test
vector<string> const ChrOmOsoMeSteps{ vector<string> const ChrOmOsoMeSteps{
ConditionalSimplifier::name, ConditionalSimplifier::name,
FunctionHoister::name, FunctionHoister::name,
RedundantAssignEliminator::name, UnusedAssignEliminator::name,
ForLoopConditionOutOfBody::name, ForLoopConditionOutOfBody::name,
Rematerialiser::name, Rematerialiser::name,
ForLoopConditionOutOfBody::name, ForLoopConditionOutOfBody::name,
@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
BOOST_TEST(chromosome.length() == allSteps.size()); BOOST_TEST(chromosome.length() == allSteps.size());
BOOST_TEST(chromosome.optimisationSteps() == allSteps); BOOST_TEST(chromosome.optimisationSteps() == allSteps);
BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighFTLMRrmVatpud"); BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighFTLMRmVatrpud");
} }
BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names) BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)