Rename AsmData -> AST

Also attempt to only include ASTForward where appropriate.

libsolidity/analysis/ControlFlowBuilder.cpp

@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolidity/analysis/ControlFlowBuilder.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 using namespace solidity;

libsolidity/analysis/ReferencesResolver.cpp

@@ -27,7 +27,7 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <liblangutil/ErrorReporter.h>

libsolidity/analysis/SyntaxChecker.cpp

@@ -23,7 +23,7 @@
 #include <libsolidity/interface/Version.h>
 
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/SemVerHandler.h>

libsolidity/analysis/TypeChecker.cpp

@@ -28,7 +28,7 @@
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/ErrorReporter.h>
 

libsolidity/analysis/ViewPureChecker.cpp

@@ -18,7 +18,7 @@
 
 #include <libsolidity/analysis/ViewPureChecker.h>
 #include <libsolidity/ast/ExperimentalFeatures.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <liblangutil/ErrorReporter.h>
 #include <libevmasm/SemanticInformation.h>

libsolidity/ast/AST.h

@@ -45,7 +45,7 @@
 
 namespace solidity::yul
 {
-// Forward-declaration to <yul/AsmData.h>
+// Forward-declaration to <yul/AST.h>
 struct Block;
 struct Dialect;
 }

libsolidity/ast/ASTJsonConverter.cpp

@@ -26,8 +26,8 @@
 #include <libsolidity/ast/TypeProvider.h>
 
 #include <libyul/AsmJsonConverter.h>
-#include <libyul/AsmData.h>
 #include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolutil/JSON.h>

libsolidity/ast/ASTJsonImporter.cpp

@@ -25,6 +25,7 @@
 
 #include <libyul/AsmJsonImporter.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
 

libsolidity/codegen/CompilerContext.cpp

@@ -32,6 +32,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/AsmCodeGen.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/evm/EVMMetrics.h>

libsolidity/codegen/ContractCompiler.cpp

@@ -31,7 +31,7 @@
 
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmAnalysis.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/AsmCodeGen.h>
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/backends/evm/EVMDialect.h>

libsolidity/codegen/ir/IRGeneratorForStatements.cpp

@@ -35,7 +35,7 @@
 #include <libevmasm/GasMeter.h>
 
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/ASTCopier.h>
 

libsolidity/interface/CompilerStack.cpp

@@ -60,6 +60,7 @@
 #include <libyul/AsmJsonConverter.h>
 #include <libyul/AssemblyStack.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SemVerHandler.h>

libsolidity/parsing/Parser.cpp

@@ -25,6 +25,7 @@
 
 #include <libsolidity/interface/Version.h>
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>

libyul/AST.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <liblangutil/SourceLocation.h>

libyul/ASTForward.h

@@ -28,6 +28,7 @@
 namespace solidity::yul
 {
 
+enum class LiteralKind;
 struct Literal;
 struct Label;
 struct Identifier;

libyul/AsmAnalysis.cpp

@@ -21,7 +21,7 @@
 
 #include <libyul/AsmAnalysis.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScopeFiller.h>
 #include <libyul/AsmScope.h>
 #include <libyul/AsmAnalysisInfo.h>
@@ -668,3 +668,8 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 
 	return true;
 }
+
+bool AsmAnalyzer::validateInstructions(FunctionCall const& _functionCall)
+{
+	return validateInstructions(_functionCall.functionName.name.str(), _functionCall.functionName.location);
+}

libyul/AsmAnalysis.h

@@ -26,7 +26,7 @@
 
 #include <libyul/Dialect.h>
 #include <libyul/AsmScope.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -114,10 +114,7 @@ private:
 
 	bool validateInstructions(evmasm::Instruction _instr, langutil::SourceLocation const& _location);
 	bool validateInstructions(std::string const& _instrIdentifier, langutil::SourceLocation const& _location);
-	bool validateInstructions(FunctionCall const& _functionCall)
-	{
-		return validateInstructions(_functionCall.functionName.name.str(), _functionCall.functionName.location);
-	}
+	bool validateInstructions(FunctionCall const& _functionCall);
 
 	yul::ExternalIdentifierAccess::Resolver m_resolver;
 	Scope* m_currentScope = nullptr;

libyul/AsmAnalysisInfo.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <map>
 #include <memory>

libyul/AsmJsonConverter.cpp

@@ -21,7 +21,7 @@
  */
 
 #include <libyul/AsmJsonConverter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libsolutil/CommonData.h>
 

libyul/AsmJsonConverter.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <liblangutil/SourceLocation.h>
 #include <json/json.h>
 #include <boost/variant.hpp>

libyul/AsmJsonImporter.cpp

@@ -23,8 +23,7 @@
  */
 
 #include <libyul/AsmJsonImporter.h>
-#include <libyul/AsmData.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <liblangutil/Scanner.h>

libyul/AsmJsonImporter.h

@@ -25,7 +25,7 @@
 
 #include <json/json.h>
 #include <liblangutil/SourceLocation.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <utility>
 

libyul/AsmParser.cpp

@@ -22,6 +22,7 @@
  */
 
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>

libyul/AsmParser.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 
 #include <liblangutil/SourceLocation.h>

libyul/AsmPrinter.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Dialect.h>
 

libyul/AsmPrinter.h

@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/YulString.h>
 

libyul/AsmScopeFiller.cpp

@@ -21,7 +21,7 @@
 
 #include <libyul/AsmScopeFiller.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmScope.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/Exceptions.h>

libyul/AsmScopeFiller.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <functional>
 #include <memory>

libyul/CMakeLists.txt

@@ -2,8 +2,8 @@ add_library(yul
 	AsmAnalysis.cpp
 	AsmAnalysis.h
 	AsmAnalysisInfo.h
-	AsmData.h
-	AsmDataForward.h
+	AST.h
+	ASTForward.h
 	AsmJsonConverter.h
 	AsmJsonConverter.cpp
 	AsmJsonImporter.h

libyul/CompilabilityChecker.h

@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/Dialect.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Object.h>
 
 #include <map>

libyul/Dialect.cpp

@@ -20,7 +20,7 @@
  */
 
 #include <libyul/Dialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace solidity::yul;
 using namespace std;

libyul/Object.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
 
 #include <libsolutil/Common.h>

libyul/ObjectParser.cpp

@@ -22,6 +22,7 @@
 #include <libyul/ObjectParser.h>
 
 #include <libyul/AsmParser.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <liblangutil/Token.h>

libyul/Utilities.cpp

@@ -21,7 +21,7 @@
 
 #include <libyul/Utilities.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <libsolutil/CommonData.h>

libyul/Utilities.h

@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libsolutil/Common.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {

libyul/backends/evm/AsmCodeGen.cpp

@@ -21,8 +21,8 @@
 
 #include <libyul/backends/evm/AsmCodeGen.h>
 
-#include <libyul/AsmData.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>

libyul/backends/evm/ConstantOptimiser.cpp

@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/CommonData.h>

libyul/backends/evm/ConstantOptimiser.h

@@ -25,7 +25,7 @@
 #include <libyul/YulString.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 
 #include <liblangutil/SourceLocation.h>
 

libyul/backends/evm/EVMCodeTransform.cpp

@@ -23,7 +23,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
 #include <liblangutil/Exceptions.h>

libyul/backends/evm/EVMCodeTransform.h

@@ -25,7 +25,7 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/AsmScope.h>
 
 #include <optional>

libyul/backends/evm/EVMDialect.cpp

@@ -22,7 +22,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
 #include <libyul/AsmParser.h>

libyul/backends/evm/EVMDialect.h

@@ -24,7 +24,7 @@
 #include <libyul/Dialect.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <liblangutil/EVMVersion.h>
 
 #include <map>

libyul/backends/evm/EVMMetrics.cpp

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

libyul/backends/evm/NoOutputAssembly.cpp

@@ -21,6 +21,7 @@
 
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <libevmasm/Instruction.h>

libyul/backends/wasm/EVMToEwasmTranslator.cpp

@@ -35,6 +35,7 @@
 #include <libyul/AsmParser.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/Object.h>
 
 #include <liblangutil/ErrorReporter.h>

libyul/backends/wasm/EVMToEwasmTranslator.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/Dialect.h>
 

libyul/backends/wasm/WasmCodeTransform.cpp

@@ -25,7 +25,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 #include <libyul/Exceptions.h>

libyul/backends/wasm/WasmCodeTransform.h

@@ -22,7 +22,7 @@
 #pragma once
 
 #include <libyul/backends/wasm/WasmAST.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/TypeInfo.h>

libyul/backends/wasm/WasmDialect.cpp

@@ -21,7 +21,7 @@
 
 #include <libyul/backends/wasm/WasmDialect.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 using namespace std;

libyul/backends/wasm/WordSizeTransform.cpp

@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/backends/wasm/WordSizeTransform.h>
 #include <libyul/Utilities.h>
 #include <libyul/Dialect.h>

libyul/optimiser/ASTCopier.cpp

@@ -23,7 +23,7 @@
 
 #include <libyul/Exceptions.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libsolutil/Common.h>
 

libyul/optimiser/ASTCopier.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/YulString.h>
 

libyul/optimiser/ASTWalker.cpp

@@ -21,7 +21,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/range/adaptor/reversed.hpp>
 

libyul/optimiser/ASTWalker.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/Exceptions.h>
 #include <libyul/YulString.h>

libyul/optimiser/BlockFlattener.cpp

@@ -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;

libyul/optimiser/BlockHasher.cpp

@@ -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;

libyul/optimiser/BlockHasher.h

@@ -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
 {

libyul/optimiser/CallGraphGenerator.cpp

@@ -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>

libyul/optimiser/CircularReferencesPruner.cpp

@@ -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>
 

libyul/optimiser/CommonSubexpressionEliminator.cpp

@@ -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;

libyul/optimiser/ConditionalSimplifier.cpp

@@ -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>

libyul/optimiser/ConditionalSimplifier.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>
 

libyul/optimiser/ConditionalUnsimplifier.cpp

@@ -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>

libyul/optimiser/ControlFlowSimplifier.cpp

@@ -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>

libyul/optimiser/DataFlowAnalyzer.cpp

@@ -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))

libyul/optimiser/DataFlowAnalyzer.h

@@ -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

libyul/optimiser/DeadCodeEliminator.cpp

@@ -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>

libyul/optimiser/Disambiguator.cpp

@@ -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>
 

libyul/optimiser/Disambiguator.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>

libyul/optimiser/EquivalentFunctionCombiner.cpp

@@ -20,7 +20,7 @@
  */
 
 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;

libyul/optimiser/EquivalentFunctionCombiner.h

@@ -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
 {

libyul/optimiser/EquivalentFunctionDetector.cpp

@@ -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;

libyul/optimiser/EquivalentFunctionDetector.h

@@ -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
 {

libyul/optimiser/ExpressionInliner.cpp

@@ -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;

libyul/optimiser/ExpressionInliner.h

@@ -21,7 +21,7 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <optional>
 #include <set>

libyul/optimiser/ExpressionJoiner.cpp

@@ -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>
 

libyul/optimiser/ExpressionJoiner.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

libyul/optimiser/ExpressionSimplifier.cpp

@@ -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;

libyul/optimiser/ExpressionSimplifier.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 

libyul/optimiser/ExpressionSplitter.cpp

@@ -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>

libyul/optimiser/ExpressionSplitter.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>

libyul/optimiser/ForLoopConditionIntoBody.cpp

@@ -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;

libyul/optimiser/ForLoopConditionOutOfBody.cpp

@@ -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;

libyul/optimiser/ForLoopInitRewriter.cpp

@@ -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;

libyul/optimiser/FullInliner.cpp

@@ -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>

libyul/optimiser/FullInliner.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>

libyul/optimiser/FunctionCallFinder.cpp

@@ -16,7 +16,7 @@
 */
 
 #include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 using namespace std;
 using namespace solidity;

libyul/optimiser/FunctionGrouper.cpp

@@ -22,7 +22,7 @@
 
 #include <libyul/optimiser/FunctionGrouper.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/range/algorithm_ext/erase.hpp>
 

libyul/optimiser/FunctionGrouper.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {

libyul/optimiser/FunctionHoister.cpp

@@ -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>
 

libyul/optimiser/FunctionHoister.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 namespace solidity::yul

libyul/optimiser/InlinableExpressionFunctionFinder.cpp

@@ -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;

libyul/optimiser/InlinableExpressionFunctionFinder.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <set>

libyul/optimiser/KnowledgeBase.cpp

@@ -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>

libyul/optimiser/KnowledgeBase.h

@@ -21,8 +21,9 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 #include <libyul/YulString.h>
+
 #include <map>
 
 namespace solidity::yul

libyul/optimiser/LoadResolver.cpp

@@ -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;

libyul/optimiser/LoopInvariantCodeMotion.cpp

@@ -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>

libyul/optimiser/MainFunction.cpp

@@ -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>
 

libyul/optimiser/MainFunction.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libyul/AsmDataForward.h>
+#include <libyul/ASTForward.h>
 
 namespace solidity::yul
 {

libyul/optimiser/Metrics.cpp

@@ -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>