Rewrite header paths to adapt to recent git mv of libsolidity/inlineasm to libyul

2023-10-03 13:03:40 +00:00 · 2018-11-23 11:18:57 +01:00 · 2018-11-23 11:18:57 +01:00 · 0f4ed52a71
commit 0f4ed52a71
parent 10e6d2897d
65 changed files with 107 additions and 107 deletions
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@ -25,9 +25,9 @@
 #include <libsolidity/analysis/NameAndTypeResolver.h>
 #include <liblangutil/Exceptions.h>
 #include <libsolidity/analysis/ConstantEvaluator.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>
 #include <liblangutil/ErrorReporter.h>

 #include <libdevcore/StringUtils.h>
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@ -27,9 +27,9 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/reversed.hpp>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>
 #include <liblangutil/ErrorReporter.h>
 #include <libdevcore/Algorithms.h>

--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@ -19,7 +19,7 @@

 #include <libevmasm/SemanticInformation.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 #include <libsolidity/ast/ExperimentalFeatures.h>

 #include <liblangutil/ErrorReporter.h>
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@ -23,8 +23,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <libdevcore/UTF8.h>
 #include <libsolidity/ast/AST.h>
-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmPrinter.h>

 using namespace std;
 using namespace langutil;
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@ -29,10 +29,10 @@
 #include <liblangutil/Scanner.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>
 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmCodeGen.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmCodeGen.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <libyul/YulString.h>

 #include <boost/algorithm/string/replace.hpp>
@ -43,7 +43,7 @@
 // Change to "define" to output all intermediate code
 #undef SOL_OUTPUT_ASM
 #ifdef SOL_OUTPUT_ASM
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmPrinter.h>
 #endif


--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@ -21,7 +21,7 @@
 */

 #include <libsolidity/codegen/ContractCompiler.h>
-#include <libsolidity/inlineasm/AsmCodeGen.h>
+#include <libyul/AsmCodeGen.h>
 #include <libsolidity/ast/AST.h>
 #include <liblangutil/ErrorReporter.h>
 #include <libsolidity/codegen/ExpressionCompiler.h>
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@ -23,11 +23,11 @@
 #include <libsolidity/interface/AssemblyStack.h>

 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/inlineasm/AsmCodeGen.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmCodeGen.h>

 #include <libevmasm/Assembly.h>

--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@ -25,7 +25,7 @@
 #include <liblangutil/SourceLocation.h>
 #include <libsolidity/parsing/Parser.h>
 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmParser.h>
+#include <libyul/AsmParser.h>
 #include <liblangutil/ErrorReporter.h>

 using namespace std;
--- a/libyul/ASTDataForward.h
+++ b/libyul/ASTDataForward.h
@ -21,7 +21,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 namespace dev
 {
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@ -18,12 +18,12 @@
 * Analyzer part of inline assembly.
 */

-#include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libyul/AsmAnalysis.h>

-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmScopeFiller.h>
-#include <libsolidity/inlineasm/AsmScope.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmScopeFiller.h>
+#include <libyul/AsmScope.h>
+#include <libyul/AsmAnalysisInfo.h>

 #include <liblangutil/ErrorReporter.h>

--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@ -23,11 +23,11 @@
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>

-#include <libsolidity/inlineasm/AsmScope.h>
+#include <libyul/AsmScope.h>

 #include <libyul/backends/evm/AbstractAssembly.h>

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
--- a/libyul/AsmAnalysisInfo.cpp
+++ b/libyul/AsmAnalysisInfo.cpp
@ -18,9 +18,9 @@
 * Information generated during analyzer part of inline assembly.
 */

-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmAnalysisInfo.h>

-#include <libsolidity/inlineasm/AsmScope.h>
+#include <libyul/AsmScope.h>

 #include <ostream>

--- a/libyul/AsmAnalysisInfo.h
+++ b/libyul/AsmAnalysisInfo.h
@ -20,7 +20,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 #include <boost/variant.hpp>

--- a/libyul/AsmCodeGen.cpp
+++ b/libyul/AsmCodeGen.cpp
@ -20,13 +20,13 @@
 * Code-generating part of inline assembly.
 */

-#include <libsolidity/inlineasm/AsmCodeGen.h>
+#include <libyul/AsmCodeGen.h>

-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmScope.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmScope.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>

 #include <libevmasm/Assembly.h>
 #include <liblangutil/SourceLocation.h>
--- a/libyul/AsmCodeGen.h
+++ b/libyul/AsmCodeGen.h
@ -22,7 +22,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libyul/AsmAnalysis.h>

 #include <functional>

--- a/libyul/AsmData.h
+++ b/libyul/AsmData.h
@ -22,7 +22,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 #include <libevmasm/Instruction.h>
 #include <liblangutil/SourceLocation.h>
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@ -20,7 +20,7 @@
 * Solidity inline assembly parser.
 */

-#include <libsolidity/inlineasm/AsmParser.h>
+#include <libyul/AsmParser.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>

--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@ -24,7 +24,7 @@

 #include <memory>
 #include <vector>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 #include <liblangutil/SourceLocation.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ParserBase.h>
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@ -20,8 +20,8 @@
 * Converts a parsed assembly into its textual form.
 */

-#include <libsolidity/inlineasm/AsmPrinter.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AsmData.h>
 #include <liblangutil/Exceptions.h>

 #include <libdevcore/CommonData.h>
--- a/libyul/AsmPrinter.h
+++ b/libyul/AsmPrinter.h
@ -22,7 +22,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 #include <libyul/YulString.h>

--- a/libyul/AsmScope.cpp
+++ b/libyul/AsmScope.cpp
@ -18,7 +18,7 @@
 * Scopes for identifiers.
 */

-#include <libsolidity/inlineasm/AsmScope.h>
+#include <libyul/AsmScope.h>

 using namespace std;
 using namespace dev;
--- a/libyul/AsmScopeFiller.cpp
+++ b/libyul/AsmScopeFiller.cpp
@ -18,11 +18,11 @@
 * Module responsible for registering identifiers inside their scopes.
 */

-#include <libsolidity/inlineasm/AsmScopeFiller.h>
+#include <libyul/AsmScopeFiller.h>

-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmScope.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmScope.h>
+#include <libyul/AsmAnalysisInfo.h>

 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Exceptions.h>
--- a/libyul/AsmScopeFiller.h
+++ b/libyul/AsmScopeFiller.h
@ -20,7 +20,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>

 #include <boost/variant.hpp>

--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@ -20,8 +20,8 @@

 #include <libyul/backends/evm/EVMCodeTransform.h>

-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>

 #include <liblangutil/Exceptions.h>

--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@ -22,7 +22,7 @@

 #include <libyul/ASTDataForward.h>

-#include <libsolidity/inlineasm/AsmScope.h>
+#include <libyul/AsmScope.h>

 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@ -22,7 +22,7 @@

 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/Common.h>

--- a/libyul/optimiser/ASTWalker.cpp
+++ b/libyul/optimiser/ASTWalker.cpp
@ -20,7 +20,7 @@

 #include <libyul/optimiser/ASTWalker.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

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

--- a/libyul/optimiser/BlockFlattener.cpp
+++ b/libyul/optimiser/BlockFlattener.cpp
@ -15,7 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <libyul/optimiser/BlockFlattener.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 #include <libdevcore/Visitor.h>
 #include <libdevcore/CommonData.h>
 #include <functional>
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@ -25,7 +25,7 @@
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@ -26,7 +26,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@ -22,8 +22,8 @@

 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmScope.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmScope.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/Disambiguator.h
+++ b/libyul/optimiser/Disambiguator.h
@ -25,7 +25,7 @@
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/optimiser/NameDispenser.h>

-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmAnalysisInfo.h>

 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@ -24,7 +24,7 @@
 #include <libyul/optimiser/Substitution.h>
 #include <libyul/optimiser/Semantics.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <boost/algorithm/cxx11/all_of.hpp>

--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@ -25,7 +25,7 @@
 #include <libyul/optimiser/Utilities.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@ -24,7 +24,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SSAValueTracker.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@ -23,7 +23,7 @@

 #include <libyul/optimiser/ASTWalker.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ b/libyul/optimiser/ForLoopInitRewriter.cpp
@ -15,7 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <libyul/optimiser/ForLoopInitRewriter.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 #include <libdevcore/CommonData.h>
 #include <functional>

--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@ -28,7 +28,7 @@
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>
 #include <libdevcore/Visitor.h>
--- a/libyul/optimiser/FunctionGrouper.cpp
+++ b/libyul/optimiser/FunctionGrouper.cpp
@ -21,7 +21,7 @@

 #include <libyul/optimiser/FunctionGrouper.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

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

--- a/libyul/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@ -23,7 +23,7 @@
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/Utilities.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@ -22,7 +22,7 @@

 #include <libyul/optimiser/Utilities.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@ -24,7 +24,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@ -20,7 +20,7 @@

 #include <libyul/optimiser/Metrics.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace dev;
 using namespace dev::yul;
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@ -20,7 +20,7 @@

 #include <libyul/optimiser/NameCollector.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@ -22,7 +22,7 @@

 #include <libyul/optimiser/NameCollector.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/RedundantAssignEliminator.cpp
@ -23,7 +23,7 @@

 #include <libyul/optimiser/Semantics.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@ -24,7 +24,7 @@
 #include <libyul/optimiser/ASTCopier.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@ -24,7 +24,7 @@
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDispenser.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/SSAValueTracker.cpp
+++ b/libyul/optimiser/SSAValueTracker.cpp
@ -21,7 +21,7 @@

 #include <libyul/optimiser/SSAValueTracker.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@ -22,7 +22,7 @@

 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libevmasm/SemanticInformation.h>

--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@ -25,7 +25,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SyntacticalEquality.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libevmasm/RuleList.h>

--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@ -25,7 +25,7 @@

 #include <libyul/ASTDataForward.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <boost/noncopyable.hpp>

--- a/libyul/optimiser/Substitution.cpp
+++ b/libyul/optimiser/Substitution.cpp
@ -20,7 +20,7 @@

 #include <libyul/optimiser/Substitution.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 using namespace std;
 using namespace dev;
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@ -36,10 +36,10 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/VarDeclPropagator.h>

-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AsmData.h>

-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmPrinter.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@ -22,7 +22,7 @@

 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@ -25,7 +25,7 @@
 #include <libyul/optimiser/Utilities.h>
 #include <libyul/Exceptions.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <boost/algorithm/cxx11/none_of.hpp>

--- a/libyul/optimiser/Utilities.cpp
+++ b/libyul/optimiser/Utilities.cpp
@ -20,7 +20,7 @@

 #include <libyul/optimiser/Utilities.h>

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <libdevcore/CommonData.h>

--- a/libyul/optimiser/VarDeclPropagator.cpp
+++ b/libyul/optimiser/VarDeclPropagator.cpp
@ -16,7 +16,7 @@
 */

 #include <libyul/optimiser/VarDeclPropagator.h>
-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>
 #include <libdevcore/CommonData.h>
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <algorithm>
--- a/libyul/optimiser/VarDeclPropagator.h
+++ b/libyul/optimiser/VarDeclPropagator.h
@ -20,7 +20,7 @@
 #include <libyul/ASTDataForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/Exceptions.h>
-#include <libsolidity/inlineasm/AsmDataForward.h>
+#include <libyul/AsmDataForward.h>
 #include <vector>
 #include <set>
 #include <map>
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@ -27,9 +27,9 @@

 #include <liblangutil/Scanner.h>

-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmPrinter.h>

 #include <libsolidity/interface/SourceReferenceFormatter.h>
 #include <liblangutil/ErrorReporter.h>
--- a/test/libyul/Common.h
+++ b/test/libyul/Common.h
@ -21,7 +21,7 @@

 #pragma once

-#include <libsolidity/inlineasm/AsmData.h>
+#include <libyul/AsmData.h>

 #include <string>
 #include <vector>
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@ -27,7 +27,7 @@
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>

-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmPrinter.h>

 #include <boost/test/unit_test.hpp>

--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@ -23,9 +23,9 @@

 #include <test/libsolidity/ErrorCheck.h>

-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>

--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@ -44,9 +44,9 @@
 #include <libyul/optimiser/RedundantAssignEliminator.h>
 #include <libyul/optimiser/Suite.h>

-#include <libsolidity/inlineasm/AsmPrinter.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmAnalysis.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>

 #include <boost/test/unit_test.hpp>
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@ -21,12 +21,12 @@
 #include <libdevcore/CommonIO.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
-#include <libsolidity/inlineasm/AsmAnalysis.h>
-#include <libsolidity/inlineasm/AsmAnalysisInfo.h>
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libsolidity/inlineasm/AsmData.h>
-#include <libsolidity/inlineasm/AsmParser.h>
-#include <libsolidity/inlineasm/AsmPrinter.h>
+#include <libyul/AsmData.h>
+#include <libyul/AsmParser.h>
+#include <libyul/AsmPrinter.h>
 #include <libsolidity/interface/SourceReferenceFormatter.h>

 #include <libyul/optimiser/BlockFlattener.h>