Skip to content

Commit 596d14f

Browse files
committed
Remove Yul VarNameCleaner
1 parent fdf4507 commit 596d14f

File tree

6 files changed

+0
-237
lines changed

6 files changed

+0
-237
lines changed

libyul/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,6 @@ add_library(yul
198198
optimiser/UnusedPruner.h
199199
optimiser/VarDeclInitializer.cpp
200200
optimiser/VarDeclInitializer.h
201-
optimiser/VarNameCleaner.cpp
202-
optimiser/VarNameCleaner.h
203201
)
204202

205203
target_link_libraries(yul PUBLIC evmasm solutil langutil smtutil fmt::fmt-header-only)

libyul/optimiser/Suite.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#include <libyul/optimiser/SyntacticalEquality.h>
5858
#include <libyul/optimiser/UnusedAssignEliminator.h>
5959
#include <libyul/optimiser/UnusedStoreEliminator.h>
60-
#include <libyul/optimiser/VarNameCleaner.h>
6160
#include <libyul/optimiser/LoadResolver.h>
6261
#include <libyul/optimiser/LoopInvariantCodeMotion.h>
6362
#include <libyul/optimiser/Metrics.h>
@@ -260,7 +259,6 @@ std::map<std::string, std::unique_ptr<OptimiserStep>> const& OptimiserSuite::all
260259
UnusedPruner,
261260
VarDeclInitializer
262261
>();
263-
// Does not include VarNameCleaner because it destroys the property of unique names.
264262
// Does not include NameSimplifier.
265263
return instance;
266264
}

libyul/optimiser/VarNameCleaner.cpp

-125
This file was deleted.

libyul/optimiser/VarNameCleaner.h

-100
This file was deleted.

test/libyul/YulOptimizerTestCommon.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include <libyul/optimiser/BlockFlattener.h>
2424
#include <libyul/optimiser/VarDeclInitializer.h>
25-
#include <libyul/optimiser/VarNameCleaner.h>
2625
#include <libyul/optimiser/ControlFlowSimplifier.h>
2726
#include <libyul/optimiser/DeadCodeEliminator.h>
2827
#include <libyul/optimiser/Disambiguator.h>

test/tools/yulopti.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <libyul/optimiser/Disambiguator.h>
3636
#include <libyul/optimiser/OptimiserStep.h>
3737
#include <libyul/optimiser/StackCompressor.h>
38-
#include <libyul/optimiser/VarNameCleaner.h>
3938
#include <libyul/optimiser/Suite.h>
4039

4140
#include <libyul/backends/evm/EVMDialect.h>
@@ -202,7 +201,6 @@ class YulOpti
202201
std::map<char, std::string> const& extraOptions = {
203202
// QUIT starts with a non-letter character on purpose to get it to show up on top of the list
204203
{'#', ">>> QUIT <<<"},
205-
{',', "VarNameCleaner"},
206204
{';', "StackCompressor"}
207205
};
208206

@@ -219,11 +217,6 @@ class YulOpti
219217
case 4:
220218
case '#':
221219
return;
222-
case ',':
223-
VarNameCleaner::run(m_context, *m_astRoot);
224-
// VarNameCleaner destroys the unique names guarantee of the disambiguator.
225-
disambiguated = false;
226-
break;
227220
case ';':
228221
{
229222
Object obj;

0 commit comments

Comments
 (0)