Merge pull request #10403 from ethereum/rename-asmdata

Rename AsmData* to AST*
2023-10-03 13:03:40 +00:00 · 2020-12-01 14:33:11 +01:00
parent 1944d5ce44 a22077f736
commit 8279d90ba2
157 changed files with 175 additions and 152 deletions
@@ -23,7 +23,7 @@

 #include <libyul/Exceptions.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/Common.h>

@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/YulString.h>

@@ -21,7 +21,7 @@

 #include <libyul/optimiser/ASTWalker.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <boost/range/adaptor/reversed.hpp>

@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/Exceptions.h>
 #include <libyul/YulString.h>
@@ -15,10 +15,13 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 // SPDX-License-Identifier: GPL-3.0
+
 #include <libyul/optimiser/BlockFlattener.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/Visitor.h>
 #include <libsolutil/CommonData.h>
+
 #include <functional>

 using namespace std;
@@ -21,7 +21,9 @@

 #include <libyul/optimiser/BlockHasher.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
+
 #include <libsolutil/CommonData.h>

 using namespace std;
@@ -21,9 +21,8 @@
 #pragma once

 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>

 namespace solidity::yul
 {
@@ -19,7 +19,7 @@
 * Specific AST walker that generates the call graph.
 */

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/optimiser/CallGraphGenerator.h>

 #include <stack>
@@ -19,7 +19,7 @@

 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/Algorithms.h>

@@ -27,7 +27,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/SideEffects.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>

 using namespace std;
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ConditionalSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
@@ -19,6 +19,7 @@

 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libsolutil/Common.h>

@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ConditionalUnsimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libsolutil/CommonData.h>
@@ -19,7 +19,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/TypeInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>
 #include <libsolutil/CommonData.h>
@@ -24,8 +24,8 @@

 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
 #include <libyul/backends/evm/EVMDialect.h>

 #include <libsolutil/CommonData.h>
@@ -39,7 +39,6 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;

-
 void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 {
 	if (auto vars = isSimpleStore(evmasm::Instruction::SSTORE, _statement))
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h> // Needed for m_zero below.
 #include <libyul/SideEffects.h>

 // TODO avoid
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/DeadCodeEliminator.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libevmasm/SemanticInformation.h>
 #include <libevmasm/AssemblyItem.h>
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/Disambiguator.h>

 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScope.h>
 #include <libyul/Dialect.h>

@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameDispenser.h>
@@ -20,7 +20,7 @@
 */

 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>

 using namespace std;
@@ -23,7 +23,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/EquivalentFunctionDetector.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 namespace solidity::yul
 {
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/EquivalentFunctionDetector.h>
 #include <libyul/optimiser/SyntacticalEquality.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/optimiser/Metrics.h>

 using namespace std;
@@ -22,7 +22,7 @@

 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/BlockHasher.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 namespace solidity::yul
 {
@@ -28,7 +28,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -21,7 +21,7 @@
 #pragma once

 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <optional>
 #include <set>
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -21,7 +21,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>

 #include <map>
@@ -32,7 +32,6 @@ namespace solidity::yul
 class NameCollector;
 struct OptimiserStepContext;

-
 /**
 * Optimiser component that modifies an AST in place, turning sequences
 * of variable declarations into complex expressions, if the variables
@@ -23,7 +23,7 @@

 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/optimiser/DataFlowAnalyzer.h>

@@ -26,7 +26,7 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/TypeInfo.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>

 #include <libsolutil/CommonData.h>
@@ -21,7 +21,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/NameDispenser.h>
@@ -18,7 +18,8 @@

 #include <libyul/optimiser/ForLoopConditionIntoBody.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/CommonData.h>

 using namespace std;
@@ -18,8 +18,9 @@

 #include <libyul/optimiser/ForLoopConditionOutOfBody.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
+
 #include <libsolutil/CommonData.h>

 using namespace std;
@@ -16,8 +16,10 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
+
 #include <libsolutil/CommonData.h>
+
 #include <functional>

 using namespace std;
@@ -30,7 +30,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>

 #include <libsolutil/CommonData.h>
@@ -20,7 +20,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/ASTWalker.h>
@@ -16,7 +16,7 @@
 */

 #include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -22,7 +22,7 @@

 #include <libyul/optimiser/FunctionGrouper.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <boost/range/algorithm_ext/erase.hpp>

@@ -22,7 +22,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 namespace solidity::yul
 {
@@ -23,7 +23,7 @@

 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -22,7 +22,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>

 namespace solidity::yul
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/InlinableExpressionFunctionFinder.h>

 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>

 #include <set>
@@ -21,7 +21,7 @@

 #include <libyul/optimiser/KnowledgeBase.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
@@ -21,8 +21,9 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
+
 #include <map>

 namespace solidity::yul
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/SideEffects.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>

 #include <utility>
@@ -25,7 +25,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/Exceptions.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -22,7 +22,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 namespace solidity::yul
 {
@@ -20,7 +20,7 @@

 #include <libyul/optimiser/Metrics.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -21,7 +21,7 @@

 #include <libyul/optimiser/NameCollector.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -23,7 +23,7 @@

 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>

@@ -20,7 +20,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>

 #include <libyul/YulString.h>

@@ -21,8 +21,7 @@

 #include <libyul/optimiser/NameDisplacer.h>

-#include <libyul/AsmData.h>
-
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -17,7 +17,7 @@

 #include <libyul/optimiser/NameSimplifier.h>
 #include <libyul/optimiser/NameCollector.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/OptimizerUtilities.h>

@@ -18,7 +18,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/OptimizerUtilities.h>

 #include <libyul/Dialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <liblangutil/Token.h>
 #include <libsolutil/CommonData.h>
@@ -22,7 +22,7 @@
 #pragma once

 #include <libsolutil/Common.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>

@@ -19,7 +19,7 @@

 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>

@@ -23,7 +23,7 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>

 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -22,7 +22,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>

@@ -24,7 +24,7 @@
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/SSAReverser.h>
 #include <libyul/optimiser/Metrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>

 #include <variant>
@@ -24,7 +24,7 @@

 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -21,7 +21,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>

@@ -22,7 +22,7 @@

 #include <libyul/optimiser/SSAValueTracker.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -23,7 +23,7 @@
 #pragma once

 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h> // Needed for m_zero below.

 #include <map>
 #include <set>
@@ -22,7 +22,7 @@
 #include <libyul/optimiser/Semantics.h>

 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>

@@ -24,7 +24,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/SideEffects.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <set>

@@ -26,7 +26,7 @@
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>

 #include <libevmasm/RuleList.h>
@@ -23,12 +23,13 @@

 #include <libevmasm/SimplificationRule.h>

-#include <libyul/AsmDataForward.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
+#include <libyul/YulString.h>

 #include <libsolutil/CommonData.h>

 #include <liblangutil/EVMVersion.h>
+#include <liblangutil/SourceLocation.h>

 #include <boost/noncopyable.hpp>

@@ -30,7 +30,7 @@

 #include <libyul/CompilabilityChecker.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -22,6 +22,8 @@

 #pragma once

+#include <libyul/Object.h>
+
 #include <memory>

 namespace solidity::yul
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/StackToMemoryMover.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Object.h>
@@ -18,7 +18,7 @@
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/backends/evm/EVMDialect.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
@@ -21,7 +21,7 @@

 #include <libyul/optimiser/Substitution.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 using namespace std;
 using namespace solidity;
@@ -63,8 +63,8 @@
 #include <libyul/backends/evm/ConstantOptimiser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>

 #include <libyul/backends/wasm/WasmDialect.h>
@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/NameDispenser.h>
@@ -21,7 +21,7 @@
 #include <libyul/optimiser/SyntacticalEquality.h>

 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>

 #include <libsolutil/CommonData.h>
@@ -21,7 +21,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>

 #include <map>
@@ -23,7 +23,7 @@

 #include <libyul/optimiser/NameCollector.h>

-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>

 #include <libsolutil/Visitor.h>
@@ -20,7 +20,7 @@
 */
 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>

 #include <vector>
@@ -27,7 +27,7 @@
 #include <libyul/optimiser/NameDisplacer.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/YulString.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>

@@ -19,7 +19,7 @@

 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/NameDispenser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>

@@ -25,7 +25,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/Exceptions.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/SideEffects.h>

@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0

 #include <libyul/optimiser/VarDeclInitializer.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>

 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
@@ -18,7 +18,7 @@

 #pragma once

-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>

@@ -18,7 +18,7 @@

 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>

 #include <algorithm>
@@ -19,7 +19,7 @@
 #pragma once


-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/OptimiserStep.h>