Merge remote-tracking branch 'origin/develop' into breaking

test/cmdlineTests/evm_to_wasm_break/output

@@ -412,13 +412,13 @@ Text representation:
         (local.set $z (i32.const 0))
         (local.set $_1 (i32.const 4294967295))
         (block
-            (local.set $condition (i32.select (local.get $_1) (i64.ne (local.get $x1) (local.get $y1)) (i64.lt_u (local.get $x1) (local.get $y1))))
+            (local.set $condition (select (local.get $_1) (i64.ne (local.get $x1) (local.get $y1)) (i64.lt_u (local.get $x1) (local.get $y1))))
             (if (i32.eq (local.get $condition) (i32.const 0)) (then
                 (block
-                    (local.set $condition_11 (i32.select (local.get $_1) (i64.ne (local.get $x2) (local.get $y2)) (i64.lt_u (local.get $x2) (local.get $y2))))
+                    (local.set $condition_11 (select (local.get $_1) (i64.ne (local.get $x2) (local.get $y2)) (i64.lt_u (local.get $x2) (local.get $y2))))
                     (if (i32.eq (local.get $condition_11) (i32.const 0)) (then
                         (block
-                            (local.set $condition_12 (i32.select (local.get $_1) (i64.ne (local.get $x3) (local.get $y3)) (i64.lt_u (local.get $x3) (local.get $y3))))
+                            (local.set $condition_12 (select (local.get $_1) (i64.ne (local.get $x3) (local.get $y3)) (i64.lt_u (local.get $x3) (local.get $y3))))
                             (if (i32.eq (local.get $condition_12) (i32.const 0)) (then
                                 (local.set $z (i64.lt_u (local.get $x4) (local.get $y4)))
                             )(else

test/externalTests/common.sh

@@ -85,9 +85,9 @@ function download_project
 
 function force_truffle_version
 {
-    local repo="$1"
+    local version="$1"
 
-    sed -i 's/"truffle":\s*".*"/"truffle": "^5.0.42"/g' package.json
+    sed -i 's/"truffle":\s*".*"/"truffle": "'"$version"'"/g' package.json
 }
 
 function truffle_setup

test/externalTests/ens.sh

@@ -36,6 +36,10 @@ function ens_test
     export CONFIG="truffle-config.js"
 
     truffle_setup https://github.com/solidity-external-tests/ens.git upgrade-0.8.0
+
+    # Use latest Truffle. Older versions crash on the output from 0.8.0.
+    force_truffle_version ^5.1.55
+
     run_install install_fn
 
     truffle_run_test compile_fn test_fn

test/externalTests/gnosis.sh

@@ -35,7 +35,7 @@ function gnosis_safe_test
 
     truffle_setup https://github.com/solidity-external-tests/safe-contracts.git development_070
 
-    force_truffle_version
+    force_truffle_version ^5.0.42
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_070|g' package.json
     rm -f package-lock.json
     rm -rf node_modules/

test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol

@@ -23,12 +23,12 @@ contract C {
 // ABIEncoderV1Only: true
 // compileViaYul: false
 // ----
-// f1() -> 0x20, 0x60, 0x20, 0, 0
+// f1() -> 0x20, 0x40, 0x20, 0
 // f2(string): 0x20, 0 -> 0x20, 0x40, 0x20, 0
 // f2(string): 0x20, 0, 0 -> 0x20, 0x40, 0x20, 0
 // g1() -> 32, 0
 // g2(string): 0x20, 0 -> 0x20, 0
 // g2(string): 0x20, 0, 0 -> 0x20, 0
-// h1() -> 0x20, 0x64, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0, 0
+// h1() -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0
 // h2(string): 0x20, 0 -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0
 // h2(string): 0x20, 0, 0 -> 0x20, 0x44, 26959946667150639794667015087019630673637144422540572481103610249216, 862718293348820473429344482784628181556388621521298319395315527974912, 0

test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string.sol

@@ -6,6 +6,7 @@ contract C {
     }
 }
 // ====
+// compileViaYul: also
 // ABIEncoderV1Only: true
 // ----
-// f() -> 0x40, 0xc0, 0x60, 0x20, 0x0, 0x0, 0x0
+// f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0

test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol

@@ -0,0 +1,16 @@
+library L {
+	function f() internal returns (uint) {
+		return 3;
+	}
+}
+
+contract C {
+	function foo() public returns (uint) {
+		return (L.f)();
+	}
+}
+
+// ====
+// compileViaYul: also
+// ----
+// foo() -> 3

test/libsolidity/semanticTests/revertStrings/empty_v1.sol

@@ -13,6 +13,6 @@ contract C {
 // compileViaYul: false
 // revertStrings: debug
 // ----
-// f() -> FAILURE, hex"08c379a0", 0x20, 0, ""
+// f() -> FAILURE, hex"08c379a0", 0x20, 0
 // g(string): 0x20, 0, "" -> FAILURE, hex"08c379a0", 0x20, 0
 // g(string): 0x20, 0 -> FAILURE, hex"08c379a0", 0x20, 0

test/libyul/Common.cpp

@@ -30,6 +30,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AssemblyStack.h>
+#include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/wasm/WasmDialect.h>
 

test/libyul/EwasmTranslationTest.cpp

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

test/libyul/Inliner.cpp

@@ -28,7 +28,7 @@
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/AsmPrinter.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libyul/Metrics.cpp

@@ -23,7 +23,7 @@
 #include <test/libyul/Common.h>
 
 #include <libyul/optimiser/Metrics.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <boost/test/unit_test.hpp>
 

test/libyul/Parser.cpp

@@ -28,6 +28,7 @@
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>

test/libyul/objectCompiler/wasm/no_main_function.yul

@@ -19,4 +19,4 @@
 // )
 //
 // Binary:
-// 0061736d01000000010401600000020100030201000503010001060100070a01066d656d6f727902000a0801060002401a0b0b
+// 0061736d01000000010401600000020100030201000503010001060100070a01066d656d6f727902000a0d010b000240420042017c1a0b0b

test/libyul/objectCompiler/wasm/simple.yul

@@ -20,4 +20,4 @@
 // )
 //
 // Binary:
-// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0801060002401a0b0b
+// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0d010b000240420042017c1a0b0b

test/libyul/objectCompiler/wasm/subObject.yul

@@ -11,7 +11,7 @@ object "a" {
 // (module
 //     ;; custom section for sub-module
 //     ;; The Keccak-256 hash of the text representation of "sub": 78ac3419d75c8d6f42f663717b8e964eeb994d77ff175145133084422dbd23d7
-//     ;; (@custom "sub" "0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0801060002401a0b0b")
+//     ;; (@custom "sub" "0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0a0108000240420b1a0b0b")
 //     ;; custom section for data
 //     ;; (@custom "str" "48656c6c6f2c20576f726c6421")
 //     (memory $memory (export "memory") 1)
@@ -19,4 +19,4 @@ object "a" {
 // )
 //
 // Binary:
-// 0061736d010000000101000201000301000503010001060100070a01066d656d6f72790200003e037375620061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0801060002401a0b0b00110373747248656c6c6f2c20576f726c64210a0100
+// 0061736d010000000101000201000301000503010001060100070a01066d656d6f727902000040037375620061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0a0108000240420b1a0b0b00110373747248656c6c6f2c20576f726c64210a0100

test/libyul/objectCompiler/wasm/subObjectAccess.yul

@@ -59,8 +59,8 @@ object "A" {
 // Text:
 // (module
 //     ;; custom section for sub-module
-//     ;; The Keccak-256 hash of the text representation of "B": 1eeffe5bc8d8819350ead60cc71ccd92c223cf52a908330db53461eb9ac89b62
-//     ;; (@custom "B" "0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000007b01430061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000003c01440061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0901070002401a1a0b0b003c01450061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0b01090002401a1a1a1a0b0b")
+//     ;; The Keccak-256 hash of the text representation of "B": ccfc48ce1c0d0542ffd25ae6858777b2f7b8a6d2b6608f679458182e719f5434
+//     ;; (@custom "B" "0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000007f01430061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000003c01440061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0d010b00024042341a423a1a0b0b003c01450061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a15011300024042341a42fd001a42b5011a423a1a0b0b")
 //     ;; custom section for data
 //     ;; (@custom "data1" "48656c6c6f2c20576f726c6421")
 //     (memory $memory (export "memory") 1)
@@ -76,4 +76,4 @@ object "A" {
 // )
 //
 // Binary:
-// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e000000fa0101420061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000007b01430061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000003c01440061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0901070002401a1a0b0b003c01450061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0b01090002401a1a1a1a0b0b001305646174613148656c6c6f2c20576f726c64210a0901070002401a1a0b0b
+// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e000000880201420061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000007f01430061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000003c01440061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0d010b00024042341a423a1a0b0b003c01450061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a15011300024042341a42fd001a42b5011a423a1a0b0b001305646174613148656c6c6f2c20576f726c64210a0e010c00024042351a4286021a0b0b

test/tools/ossfuzz/CMakeLists.txt

@@ -1,12 +1,14 @@
 add_custom_target(ossfuzz)
 add_dependencies(ossfuzz
         solc_opt_ossfuzz
+        solc_opt_mutator_ossfuzz
         solc_noopt_ossfuzz
+        solc_noopt_mutator_ossfuzz
         const_opt_ossfuzz
         strictasm_diff_ossfuzz
         strictasm_opt_ossfuzz
         strictasm_assembly_ossfuzz
-        )
+)
 
 
 if (OSSFUZZ)
@@ -31,6 +33,16 @@ if (OSSFUZZ)
     target_link_libraries(solc_opt_ossfuzz PRIVATE libsolc evmasm)
     set_target_properties(solc_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
 
+    add_executable(solc_opt_mutator_ossfuzz
+            solc_opt_ossfuzz.cpp
+            ../fuzzer_common.cpp
+            ../../TestCaseReader.cpp
+            SolidityGenerator.cpp
+            SolidityCustomMutatorInterface.cpp
+    )
+    target_link_libraries(solc_opt_mutator_ossfuzz PRIVATE libsolc evmasm)
+    set_target_properties(solc_opt_mutator_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
+
     add_executable(solc_noopt_ossfuzz
             solc_noopt_ossfuzz.cpp
             ../fuzzer_common.cpp
@@ -39,6 +51,16 @@ if (OSSFUZZ)
     target_link_libraries(solc_noopt_ossfuzz PRIVATE libsolc evmasm)
     set_target_properties(solc_noopt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
 
+    add_executable(solc_noopt_mutator_ossfuzz
+            solc_noopt_ossfuzz.cpp
+            ../fuzzer_common.cpp
+            ../../TestCaseReader.cpp
+            SolidityGenerator.cpp
+            SolidityCustomMutatorInterface.cpp
+    )
+    target_link_libraries(solc_noopt_mutator_ossfuzz PRIVATE libsolc evmasm)
+    set_target_properties(solc_noopt_mutator_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
+
     add_executable(const_opt_ossfuzz const_opt_ossfuzz.cpp ../fuzzer_common.cpp)
     target_link_libraries(const_opt_ossfuzz PRIVATE libsolc evmasm)
     set_target_properties(const_opt_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
@@ -82,14 +104,14 @@ if (OSSFUZZ)
             protoToYul.cpp
             yulProto.pb.cc
             protomutators/YulProtoMutator.cpp
-)
+    )
     target_include_directories(yul_proto_diff_custom_mutate_ossfuzz PRIVATE /usr/include/libprotobuf-mutator)
     target_link_libraries(yul_proto_diff_custom_mutate_ossfuzz PRIVATE yul
             yulInterpreter
             protobuf-mutator-libfuzzer.a
             protobuf-mutator.a
             protobuf.a
-)
+    )
     set_target_properties(yul_proto_diff_custom_mutate_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
     target_compile_options(yul_proto_diff_custom_mutate_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion)
 
@@ -139,12 +161,24 @@ else()
             )
     target_link_libraries(solc_opt_ossfuzz PRIVATE libsolc evmasm)
 
+    add_library(solc_opt_mutator_ossfuzz
+            solc_opt_ossfuzz.cpp
+            ../fuzzer_common.cpp
+            )
+    target_link_libraries(solc_opt_mutator_ossfuzz PRIVATE libsolc evmasm)
+
     add_library(solc_noopt_ossfuzz
             solc_noopt_ossfuzz.cpp
             ../fuzzer_common.cpp
             )
     target_link_libraries(solc_noopt_ossfuzz PRIVATE libsolc evmasm)
 
+    add_library(solc_noopt_mutator_ossfuzz
+            solc_noopt_ossfuzz.cpp
+            ../fuzzer_common.cpp
+            )
+    target_link_libraries(solc_noopt_mutator_ossfuzz PRIVATE libsolc evmasm)
+
     add_library(const_opt_ossfuzz
             const_opt_ossfuzz.cpp
             ../fuzzer_common.cpp)

test/tools/ossfuzz/SolidityCustomMutatorInterface.cpp

@@ -0,0 +1,69 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+
+#include <test/tools/ossfuzz/SolidityCustomMutatorInterface.h>
+#include <test/tools/ossfuzz/SolidityGenerator.h>
+
+#include <liblangutil/Exceptions.h>
+
+using namespace std;
+using namespace solidity::test::fuzzer;
+
+namespace
+{
+/// Forward declare libFuzzer's default mutator definition
+extern "C" size_t LLVMFuzzerMutate(uint8_t* _data, size_t _size, size_t _maxSize);
+
+/// Define Solidity's custom mutator by implementing libFuzzer's
+/// custom mutator external interface.
+extern "C" size_t LLVMFuzzerCustomMutator(
+	uint8_t* _data,
+	size_t _size,
+	size_t _maxSize,
+	unsigned int _seed
+)
+{
+	if (_maxSize <= _size || _size == 0)
+		return LLVMFuzzerMutate(_data, _size, _maxSize);
+	return SolidityCustomMutatorInterface{_data, _size, _maxSize, _seed}.generate();
+}
+}
+
+SolidityCustomMutatorInterface::SolidityCustomMutatorInterface(
+	uint8_t* _data,
+	size_t _size,
+	size_t _maxSize,
+	unsigned int _seed
+	):
+	data(_data),
+	size(_size),
+	maxMutantSize(_maxSize),
+	generator(make_shared<SolidityGenerator>(_seed))
+{}
+
+size_t SolidityCustomMutatorInterface::generate()
+{
+	string testCase = generator->generateTestProgram();
+	solAssert(
+		!testCase.empty() && data,
+		"Solc custom mutator: Invalid mutant or memory pointer"
+	);
+	size_t mutantSize = min(testCase.size(), maxMutantSize - 1);
+	mempcpy(data, testCase.data(), mutantSize);
+	return mutantSize;
+}

test/tools/ossfuzz/SolidityCustomMutatorInterface.h

@@ -0,0 +1,46 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+/**
+ * Implements libFuzzer's custom mutator interface.
+ */
+
+#pragma once
+
+#include <test/tools/ossfuzz/SolidityGenerator.h>
+
+#include <memory>
+
+namespace solidity::test::fuzzer
+{
+struct SolidityCustomMutatorInterface
+{
+	SolidityCustomMutatorInterface(uint8_t* _data, size_t _size, size_t _maxSize, unsigned _seed);
+	/// Generates Solidity test program, copies it into buffer
+	/// provided by libFuzzer and @returns size of the test program.
+	size_t generate();
+
+	/// Raw pointer to libFuzzer provided input
+	uint8_t* data;
+	/// Size of libFuzzer provided input
+	size_t size;
+	/// Maximum length of mutant specified by libFuzzer
+	size_t maxMutantSize;
+	/// Solidity generator handle
+	std::shared_ptr<SolidityGenerator> generator;
+};
+}

test/tools/ossfuzz/SolidityGenerator.cpp

@@ -0,0 +1,35 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+
+#include <test/tools/ossfuzz/SolidityGenerator.h>
+
+#include <libsolutil/Whiskers.h>
+
+using namespace solidity::test::fuzzer;
+using namespace solidity::util;
+using namespace std;
+
+string SolidityGenerator::generateTestProgram()
+{
+	// TODO: Add generators for grammar elements of
+	// Solidity antlr4 grammar. Currently, the generated
+	// test program consists of a version pragma only.
+	return Whiskers(R"(pragma <directive>;)")
+		("directive", "solidity >= 0.0.0")
+		.render();
+}

test/tools/ossfuzz/SolidityGenerator.h

@@ -0,0 +1,42 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// SPDX-License-Identifier: GPL-3.0
+/**
+ * Implements generators for synthesizing mostly syntactically valid
+ * Solidity test programs.
+ */
+
+#pragma once
+
+#include <random>
+
+namespace solidity::test::fuzzer
+{
+using RandomEngine = std::mt19937_64;
+
+class SolidityGenerator
+{
+public:
+	SolidityGenerator(uint64_t _seed): m_rand(_seed)
+	{}
+	/// @returns a pseudo randomly generated test program
+	std::string generateTestProgram();
+private:
+	/// Random number generator
+	RandomEngine const m_rand;
+};
+}

test/tools/yulInterpreter/EVMInstructionInterpreter.cpp

@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/Interpreter.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libevmasm/Instruction.h>
 

test/tools/yulInterpreter/EVMInstructionInterpreter.h

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

test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp

@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/Interpreter.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 
 #include <libevmasm/Instruction.h>
 

test/tools/yulInterpreter/EwasmBuiltinInterpreter.h

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

test/tools/yulInterpreter/Interpreter.cpp

@@ -24,7 +24,7 @@
 #include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
 #include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
 
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>

test/tools/yulInterpreter/Interpreter.h

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <libyul/AsmData.h>
+#include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
 #include <libsolutil/FixedHash.h>

test/tools/yulopti.cpp

@@ -26,7 +26,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libsolidity/parsing/Parser.h>
-#include <libyul/AsmData.h>
+#include <libyul/AST.h>
 #include <libyul/AsmParser.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/Object.h>

test/yulPhaser/Program.cpp

@@ -24,7 +24,6 @@
 #include <libyul/optimiser/BlockFlattener.h>
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
-#include <libyul/AsmData.h>
 
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>