Remove YulName header

clonker · clonker · commit fdf4507764ac · 2025-04-02T14:41:13.000+02:00
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
@@ -24,7 +24,6 @@
 #include <libsolc/libsolc.h>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/Version.h>
-#include <libyul/YulName.h>
 
 #include <cstdlib>
 #include <list>
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
@@ -38,7 +38,6 @@
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/optimiser/Suite.h>
 #include <libyul/Object.h>
-#include <libyul/YulName.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/Whiskers.h>
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
@@ -38,7 +38,6 @@
 #include <libyul/optimiser/Suite.h>
 #include <libyul/Object.h>
 #include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulName.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Assembly.h>
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
@@ -66,7 +66,6 @@
 
 #include <libstdlib/stdlib.h>
 
-#include <libyul/YulName.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/YulStack.h>
diff --git a/libyul/AST.h b/libyul/AST.h
@@ -26,7 +26,6 @@
 #include <libyul/ASTForward.h>
 #include <libyul/ASTLabelRegistry.h>
 #include <libyul/Builtins.h>
-#include <libyul/YulName.h>
 
 #include <liblangutil/DebugData.h>
 
diff --git a/libyul/ASTForward.h b/libyul/ASTForward.h
@@ -30,6 +30,7 @@ namespace solidity::yul
 
 using YulName = std::size_t;
 
+class ASTLabelRegistry;
 enum class LiteralKind;
 class LiteralValue;
 struct Literal;
diff --git a/libyul/AsmPrinter.h b/libyul/AsmPrinter.h
@@ -24,7 +24,6 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 
 #include <libsolutil/CommonData.h>
 
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
@@ -44,7 +44,6 @@ add_library(yul
 	Utilities.h
 	YulControlFlowGraphExporter.h
 	YulControlFlowGraphExporter.cpp
-	YulName.h
 	backends/evm/AbstractAssembly.h
 	backends/evm/AsmCodeGen.cpp
 	backends/evm/AsmCodeGen.h
diff --git a/libyul/Exceptions.h b/libyul/Exceptions.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
+#include <libyul/ASTForward.h>
+
 #include <libsolutil/Exceptions.h>
 #include <libsolutil/Assertions.h>
 
-#include <libyul/YulName.h>
-
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/facilities/overload.hpp>
diff --git a/libyul/ObjectOptimizer.h b/libyul/ObjectOptimizer.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
+#include <libyul/ASTLabelRegistry.h>
 #include <libyul/Object.h>
 
 #include <liblangutil/EVMVersion.h>
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
@@ -23,7 +23,6 @@
 
 using namespace solidity;
 using namespace solidity::yul;
-using namespace solidity::util;
 
 bool Scope::registerVariable(YulName _name)
 {
diff --git a/libyul/Scope.h b/libyul/Scope.h
@@ -21,13 +21,10 @@
 
 #pragma once
 
-#include <liblangutil/Exceptions.h>
+#include <libyul/ASTForward.h>
 
-#include <libyul/YulName.h>
-
-#include <functional>
-#include <memory>
-#include <optional>
+#include <cstddef>
+#include <map>
 #include <variant>
 
 namespace solidity::yul
diff --git a/libyul/YulName.h b/libyul/YulName.h
diff --git a/libyul/backends/evm/ConstantOptimiser.h b/libyul/backends/evm/ConstantOptimiser.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulName.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/ASTForward.h>
diff --git a/libyul/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
@@ -23,8 +23,6 @@
 
 #include <libyul/ASTForward.h>
 
-#include <libyul/YulName.h>
-
 #include <memory>
 #include <optional>
 #include <set>
diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
@@ -24,7 +24,6 @@
 #include <libyul/ASTForward.h>
 
 #include <libyul/Exceptions.h>
-#include <libyul/YulName.h>
 
 #include <map>
 #include <optional>
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
@@ -22,7 +22,6 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/CircularReferencesPruner.h b/libyul/optimiser/CircularReferencesPruner.h
@@ -27,7 +27,6 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/YulName.h>
 
 namespace solidity::yul
 {
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
@@ -25,7 +25,6 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/KnowledgeBase.h>
-#include <libyul/YulName.h>
 #include <libyul/AST.h> // Needed for m_zero below.
 #include <libyul/SideEffects.h>
 
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulName.h>
 #include <libyul/ControlFlowSideEffects.h>
 
 #include <map>
diff --git a/libyul/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
@@ -22,7 +22,6 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 
 #include <optional>
 #include <set>
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
+#include <libyul/ASTLabelRegistry.h>
 
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/ASTWalker.h>
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/LabelIDDispenser.h>
 
 #include <libyul/AST.h>
-#include <libyul/YulName.h>
 #include <libsolutil/CommonData.h>
 
 #include <range/v3/algorithm/any_of.hpp>
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
@@ -22,8 +22,8 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
+#include <libyul/ASTLabelRegistry.h>
 #include <libyul/Dialect.h>
-#include <libyul/YulName.h>
 
 #include <libsolutil/Common.h>
 #include <libsolutil/Numeric.h>
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/YulName.h>
 
 #include <map>
 #include <set>
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
@@ -25,7 +25,6 @@
 
 #include <libyul/ASTForward.h>
 #include <libyul/Builtins.h>
-#include <libyul/YulName.h>
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
diff --git a/libyul/optimiser/StackToMemoryMover.h b/libyul/optimiser/StackToMemoryMover.h
@@ -23,7 +23,6 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 
 #include <liblangutil/SourceLocation.h>
 #include <libsolutil/Common.h>
diff --git a/libyul/optimiser/Substitution.h b/libyul/optimiser/Substitution.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTCopier.h>
-#include <libyul/YulName.h>
 
 #include <map>
 
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <liblangutil/EVMVersion.h>
 
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libyul/ASTForward.h>
-#include <libyul/YulName.h>
 
 #include <map>
 #include <memory>
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -25,8 +25,6 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDisplacer.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/YulName.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/UnusedPruner.h b/libyul/optimiser/UnusedPruner.h
@@ -23,7 +23,6 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/YulName.h>
 
 #include <map>
 #include <set>
diff --git a/test/libyul/YulOptimizerTestCommon.h b/test/libyul/YulOptimizerTestCommon.h
@@ -21,8 +21,6 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/LabelIDDispenser.h>
 
-#include <libyul/YulName.h>
-
 #include <set>
 #include <memory>
 
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
@@ -28,7 +28,6 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AST.h>
 #include <libyul/ObjectParser.h>
-#include <libyul/YulName.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/Disambiguator.h>
 #include <libyul/optimiser/ForLoopInitRewriter.h>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`
`24`	`24`	`using namespace solidity;`
`25`	`25`	`using namespace solidity::yul;`
`26`		`-using namespace solidity::util;`
`27`	`26`
`28`	`27`	`bool Scope::registerVariable(YulName _name)`
`29`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`
`23`	`23`	`#include <libyul/optimiser/ASTWalker.h>`
`24`	`24`	`#include <libyul/ASTForward.h>`
`25`		`-#include <libyul/YulName.h>`
`26`	`25`
`27`	`26`	`namespace solidity::yul`
`28`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`#include <libyul/optimiser/ASTWalker.h>`
`28`	`28`	`#include <libyul/optimiser/CallGraphGenerator.h>`
`29`	`29`	`#include <libyul/optimiser/OptimiserStep.h>`
`30`		`-#include <libyul/YulName.h>`
`31`	`30`
`32`	`31`	`namespace solidity::yul`
`33`	`32`	`{`